Merge #955 #957

955: Update QEMU version to 7.0.0 for Ubuntu targets r=Alexhuszagh a=Jules-Bertholet



957: Use latest Debian kernel images r=Alexhuszagh a=Jules-Bertholet



Co-authored-by: Jules Bertholet <[email protected]>

Author: bors[bot]

.changes/955.json

@@ -0,0 +1,5 @@
+{
+    "description": "Update QEMU to version 7.0.0 for Ubuntu targets",
+    "type": "changed",
+    "breaking": false
+}

.changes/957.json

@@ -0,0 +1,5 @@
+{
+    "description": "use latest Debian kernel images",
+    "type": "changed",
+    "breaking": false
+}

docker/linux-image.sh

@@ -57,7 +57,7 @@ max_kernel_version() {
 main() {
     # arch in the rust target
     local arch="${1}" \
-          kversion=5.10.0-8
+          kversion=5.10.0-16
 
     local debsource="deb http://http.debian.net/debian/ bullseye main"
     debsource="${debsource}\ndeb http://security.debian.org/ bullseye-security main"
@@ -189,9 +189,9 @@ main() {
     dpkg --add-architecture "${arch}" || echo "foreign-architecture ${arch}" > /etc/dpkg/dpkg.cfg.d/multiarch
 
     # Add Debian keys.
-    curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/archive-key-{7.0,8,9,10}.asc' -O
-    curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/archive-key-{8,9,10}-security.asc' -O
-    curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/release-{7,8,9,10}.asc' -O
+    curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/archive-key-{7.0,8,9,10,11}.asc' -O
+    curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/archive-key-{8,9,10,11}-security.asc' -O
+    curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/release-{7,8,9,10,11}.asc' -O
     curl --retry 3 -sSfL 'https://www.ports.debian.org/archive_{2020,2021,2022}.key' -O
 
     for key in *.asc *.key; do

docker/qemu.sh

@@ -171,11 +171,11 @@ main() {
         libselinux1-dev \
         zlib1g-dev
 
-    # if we have python3.6+, we can install qemu 6.1.0, which needs ninja-build
+    # if we have python3.6+, we can install qemu 7.0.0, which needs ninja-build
     # ubuntu 16.04 only provides python3.5, so remove when we have a newer qemu.
     is_ge_python36=$(python3 -c "import sys; print(int(sys.version_info >= (3, 6)))")
     if [[ "${is_ge_python36}" == "1" ]]; then
-        if_ubuntu version=6.1.0
+        if_ubuntu version=7.0.0
         if_ubuntu install_packages ninja-build
     fi