Merge pull request #386 from the-snowwhite/add_jammy

Add jammy

Author: cdsteinkuehler

debian/buildsystem/Dockerfile

@@ -64,6 +64,7 @@ RUN apt-get update &&
 RUN apt-get update &&                                                             \
     apt-get install -y                                                            \
         curl                                                                      \
+        wget                                                                      \
         apt-transport-https                                                       \
         lsb-release                                                               \
         ca-certificates &&                                                        \
@@ -118,13 +119,7 @@ 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 until wget -O /tmp/parsefile "https://api.github.com/repos/kitware/cmake/releases/latest"; do sleep 60 ; done
 
 RUN curl -1vLf \
     $( jq -r --arg FILE "cmake-\d{1,}\.\d{1,}\.\d{1,}(-.{1,})?-linux-$(dpkg-architecture -qDEB_BUILD_GNU_CPU)\.sh" \

debian/buildsystem/debian-distro-settings.json

@@ -17,8 +17,14 @@
       "distributionCodename": "Focal",
       "baseImage": "ubuntu:focal",
       "releaseNumber": 20.04
+    },
+     {
+      "distributionID": "Ubuntu",
+      "distributionCodename": "Jammy",
+      "baseImage": "ubuntu:jammy",
+      "releaseNumber": 22.04
     }
-  ],
+ ],
   "allowedCombinations": [
     {
       "osVersionNumber": 18.04,
@@ -40,6 +46,10 @@
       "osVersionNumber": 20.04,
       "architecture": "amd64"
     },
+    {
+      "osVersionNumber": 22.04,
+      "architecture": "amd64"
+    },
     {
       "osVersionNumber": 18.04,
       "architecture": "armhf"
@@ -52,6 +62,10 @@
       "osVersionNumber": 20.04,
       "architecture": "armhf"
     },
+    {
+      "osVersionNumber": 22.04,
+      "architecture": "armhf"
+    },
     {
       "osVersionNumber": 18.04,
       "architecture": "arm64"
@@ -63,6 +77,10 @@
     {
       "osVersionNumber": 20.04,
       "architecture": "arm64"
+    },
+    {
+      "osVersionNumber": 22.04,
+      "architecture": "arm64"
     }
   ],
   "imageNameRoot": "machinekit-hal-@DISTRIBUTION@-builder-v.@TAG@"