diff options
author | Simo Fält <simo.falt@qt.io> | 2023-12-12 12:31:00 +0200 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2024-02-28 05:24:10 +0000 |
commit | 54245a4888c6f1e05a5f7a8568e2659507d62aa0 (patch) | |
tree | e415d96c61e4ec6a06f871b9cf02ccf90336c312 /coin/platform_configs | |
parent | 2c9664ca33d2ed3d8236c865a489c9e7c5885f68 (diff) |
COIN: Update used chroot for Debian packages
Use Ubuntu 22.04 instead of 20.04
Pick-to: 6.7
Change-Id: If03ba14555fdcd0c98fab3843bdfd5c2ca1eba3f
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 09571b67..30024282 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -269,26 +269,27 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', ] - - Id: 'focal-arm64-debian-pkg-packaging' + Id: 'jammy-arm64-debian-pkg-packaging' Template: 'qtci-linux-Debian-11.6-aarch64-50' Compiler: 'GCC' Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant'] Environment variables: [ 'DEBIAN_RULES_REF=6.8_dev', + 'COIN_TARGET_DIST=tqtc-jammy', 'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/', - 'COIN_SBUILD_CHROOT=focal-arm64-sbuild', - 'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse', + 'COIN_SBUILD_CHROOT=jammy-arm64-sbuild', + 'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ jammy main universe multiverse', 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', ] - - Id: 'focal-amd64-debian-pkg-packaging' + Id: 'jammy-amd64-debian-pkg-packaging' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant'] Environment variables: [ 'DEBIAN_RULES_REF=6.8_dev', + 'COIN_TARGET_DIST=tqtc-jammy', 'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/', - 'COIN_SBUILD_CHROOT=focal-amd64-sbuild', - 'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ focal main universe multiverse', - 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', + 'COIN_SBUILD_CHROOT=jammy-amd64-sbuild', + 'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse', ] |