Change Linux kernel versions from 5.x to 6.x for certain targets.

cross-rs · Oct 24, 2022 · 339e8ee · 339e8ee
1 parent e23ef05
commit 339e8ee
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/.changes/1095.json b/.changes/1095.json
@@ -0,0 +1,6 @@
+{
+    "type": "fixed",
+    "description": "fix image build issues for powerpc64, riscv64, and sparc64 *-linux-gnu images by using a 6.x kernel instead of a 5.x kernel.",
+    "breaking": true,
+    "issues": [1094]
+}
diff --git a/.changes/591.json b/.changes/591.json
@@ -9,5 +9,10 @@
         "description": "remove Linux image from `mips-unknown-linux-gnu`.",
         "type": "removed",
         "breaking": true
+    },
+    {
+        "type": "changed",
+        "description": "change powerpc64, riscv64, and sparc64 *-linux-gnu images to use a 6.x kernel instead of a 5.x kernel.",
+        "breaking": true
     }
 ]
diff --git a/docker/linux-image.sh b/docker/linux-image.sh
@@ -78,7 +78,7 @@ main() {
             ;;
         armv7)
             arch=armhf
-            kernel="5.*-armmp"
+            kernel='5.*-armmp'
             deps=(libcrypt1:"${arch}")
             ;;
         i686)
@@ -91,15 +91,15 @@ main() {
             libgcc="libgcc1"
             debsource="deb http://http.debian.net/debian/ buster main"
             debsource="${debsource}\ndeb http://security.debian.org/ buster/updates main"
-            kernel="4.*-4kc-malta"
+            kernel='4.*-4kc-malta'
             ncurses="=6.1*"
             ;;
         mipsel)
-            kernel="5.*-4kc-malta"
+            kernel='5.*-4kc-malta'
             deps=(libcrypt1:"${arch}")
             ;;
         mips64el)
-            kernel="5.*-5kc-malta"
+            kernel='5.*-5kc-malta'
             deps=(libcrypt1:"${arch}")
             ;;
         powerpc)
@@ -123,32 +123,32 @@ main() {
             # there is no stable port
             arch=ppc64
             # https://packages.debian.org/en/sid/linux-image-powerpc64
-            kernel='5.*-powerpc64'
+            kernel='6.*-powerpc64'
             debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
             debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
             # sid version of dropbear requires these dependencies
             deps=(libcrypt1:"${arch}")
             ;;
         powerpc64le)
             arch=ppc64el
-            kernel="5.*-powerpc64le"
+            kernel='5.*-powerpc64le'
             deps=(libcrypt1:"${arch}")
             ;;
         riscv64)
-            kernel="5.*-riscv64"
+            kernel='6.*-riscv64'
             debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
             debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
             deps=(libcrypt1:"${arch}")
             ;;
         s390x)
             arch=s390x
-            kernel="5.*-s390x"
+            kernel='5.*-s390x'
             deps=(libcrypt1:"${arch}")
             ;;
         sparc64)
             # there is no stable port
             # https://packages.debian.org/en/sid/linux-image-sparc64
-            kernel='5.*-sparc64'
+            kernel='6.*-sparc64'
             debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
             debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
             # sid version of dropbear requires these dependencies