From d7166acfaebd973e6d83b699ea549d750fbd320b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 15 Aug 2025 09:05:16 +0300 Subject: [PATCH] COIN: Fix Debian bookworm chroot Debian stable codename is now trixie. Pick-to: 6.10 6.9 6.8 Change-Id: I296782cef2a4329e359413cd7515a8dfca271095 Reviewed-by: Jani Heikkinen (cherry picked from commit 2dbbd0853f3de4cfbb1442f065125a56dfceae70) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- .../qtci-linux-Debian-11.6-aarch64/92-sbuild.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 827b13c9..8e9b4aed 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -405,7 +405,7 @@ Configurations: 'DEBIAN_RULES_REF=6.11_gles', 'COIN_TARGET_DIST=tqtc-bookworm', 'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/', - 'COIN_SBUILD_CHROOT=stable-arm64-sbuild', + 'COIN_SBUILD_CHROOT=bookworm-arm64-sbuild', 'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main', 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', ] diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh index 8991bcca..f4c9b3d9 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh @@ -41,8 +41,8 @@ EOF sudo sbuild-adduser "$LOGNAME" newgrp sbuild -# Create chroot for debian stable -sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64 +# Create chroot for debian bookworm +sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-arm64 echo "Create chroot for Ubuntu Jammy" # First we need update the deboostrap scripts @@ -60,5 +60,5 @@ sudo sbuild-createchroot --include=gnupg,ca-certificates jammy /srv/chroot/jammy echo "Done creating chroot for Ubuntu Jammy" # Update chroot. -sudo sbuild-update -udcar stable +sudo sbuild-update -udcar bookworm sudo sbuild-update -udcar jammy