lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-18 11:06:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

COIN: Fix Debian bookworm chroot

Browse Source 
Debian stable codename is now trixie.

Pick-to: 6.10 6.9 6.8
Change-Id: I296782cef2a4329e359413cd7515a8dfca271095
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 2dbbd0853f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Simo Fält
2025-08-15 09:05:16 +03:00
committed by Qt Cherry-pick Bot
parent 3ba1fb95be
commit d7166acfae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/cmake_platforms.yaml
View File

@@ -405,7 +405,7 @@ Configurations:
'DEBIAN_RULES_REF=6.11_gles', 'DEBIAN_RULES_REF=6.11_gles',
'COIN_TARGET_DIST=tqtc-bookworm', 'COIN_TARGET_DIST=tqtc-bookworm',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/', '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_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
] ]

6
coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
View File

@@ -41,8 +41,8 @@ EOF
sudo sbuild-adduser "$LOGNAME" sudo sbuild-adduser "$LOGNAME"
newgrp sbuild newgrp sbuild
# Create chroot for debian stable # Create chroot for debian bookworm
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64 sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-arm64
echo "Create chroot for Ubuntu Jammy" echo "Create chroot for Ubuntu Jammy"
# First we need update the deboostrap scripts # 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" echo "Done creating chroot for Ubuntu Jammy"
# Update chroot. # Update chroot.
sudo sbuild-update -udcar stable sudo sbuild-update -udcar bookworm
sudo sbuild-update -udcar jammy sudo sbuild-update -udcar jammy