Merge pull request #385 from the-snowwhite/fix_build_and_mksocfpga

Fix build and mksocfpga

Author: the-snowwhite

debian/buildsystem/Dockerfile

@@ -118,10 +118,17 @@ RUN apt-get update &&       \
     apt-get clean;
 
 # Kitware is publishing pre-built binaries only for amd64 and arm64 architectures!
+RUN curl \
+    --connect-timeout 30 \
+    --max-time 30 \
+    --retry 30 \
+    --retry-delay 5 \
+    --retry-max-time 40 \
+    https://api.github.com/repos/kitware/cmake/releases/latest --output /tmp/parsefile --silent
+
 RUN curl -1vLf \
-    $(curl -s https://api.github.com/repos/kitware/cmake/releases/latest | \
-        jq -r --arg FILE "cmake-\d{1,}\.\d{1,}\.\d{1,}(-.{1,})?-linux-$(dpkg-architecture -qDEB_BUILD_GNU_CPU)\.sh" \
-        '.assets | .[] | select(.name? | match($FILE)) | .browser_download_url') \
+    $( jq -r --arg FILE "cmake-\d{1,}\.\d{1,}\.\d{1,}(-.{1,})?-linux-$(dpkg-architecture -qDEB_BUILD_GNU_CPU)\.sh" \
+        '.assets | .[] | select(.name? | match($FILE)) | .browser_download_url' /tmp/parsefile) \
         --output /tmp/cmake.sh && \
     bash /tmp/cmake.sh --skip-license --prefix=/usr/local
 

debian/buildsystem/debian-distro-settings.json

@@ -17,18 +17,6 @@
       "distributionCodename": "Focal",
       "baseImage": "ubuntu:focal",
       "releaseNumber": 20.04
-    },
-    {
-      "distributionID": "Ubuntu",
-      "distributionCodename": "Hirsute",
-      "baseImage": "ubuntu:hirsute",
-      "releaseNumber": 21.04
-    },
-    {
-      "distributionID": "Ubuntu",
-      "distributionCodename": "Jammy",
-      "baseImage": "ubuntu:jammy",
-      "releaseNumber": 22.04
     }
   ],
   "allowedCombinations": [
@@ -52,10 +40,6 @@
       "osVersionNumber": 20.04,
       "architecture": "amd64"
     },
-    {
-      "osVersionNumber": 22.04,
-      "architecture": "amd64"
-    },
     {
       "osVersionNumber": 18.04,
       "architecture": "armhf"
@@ -68,10 +52,6 @@
       "osVersionNumber": 20.04,
       "architecture": "armhf"
     },
-    {
-      "osVersionNumber": 22.04,
-      "architecture": "armhf"
-    },
     {
       "osVersionNumber": 18.04,
       "architecture": "arm64"
@@ -83,10 +63,6 @@
     {
       "osVersionNumber": 20.04,
       "architecture": "arm64"
-    },
-    {
-      "osVersionNumber": 22.04,
-      "architecture": "arm64"
     }
   ],
   "imageNameRoot": "machinekit-hal-@DISTRIBUTION@-builder-v.@TAG@"