qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

COIN: Use Ubuntu Focal chroot instead of Debian stable 

We need to use older chroot to build debian packages.

Task-number: QTBUG-117120
Change-Id: I044e398324c380716b309dad5b087e97bc6688ab
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 43e1a3d2f5)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Simo Fält 2023-09-18 11:29:03 +03:00
parent 8e5e4d5e2c
commit 43d66408b0
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
coin/platform_configs/cmake_platforms.yaml
View File

@ -297,6 +297,8 @@ Configurations:
Environment variables: [
'DEBIAN_RULES_REF=6.6_dev',
'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',
]
-
Id: 'focal-amd64-debian-pkg-packaging'
@ -306,4 +308,7 @@ Configurations:
Environment variables: [
'DEBIAN_RULES_REF=6.6_dev',
'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',
]

1
coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
View File

@ -173,6 +173,7 @@ installPackages+=(net-tools)
installPackages+=(bridge-utils)
## For debian building debian packages
installPackages+=(sbuild)
installPackages+=(ubuntu-dev-tools)
installPackages+=(apt-cacher-ng)
installPackages+=(devscripts)
installPackages+=(piuparts)

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

@ -40,12 +40,15 @@ sudo sbuild-adduser "$LOGNAME"
newgrp sbuild
# Create chroot
#sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild http://127.0.0.1:3142/deb.debian.org/debian
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64
# For ubuntu 20.04
echo "Create chroot for Ubuntu Focal"
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-arm64 http://ports.ubuntu.com/ubuntu-ports/
echo "Done creating chroot for Ubuntu Focal"
# Update chroot
sudo sbuild-update -udcar stable
sudo sbuild-update -udcar focal

1
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
View File

@ -214,6 +214,7 @@ installPackages+=(net-tools)
installPackages+=(bridge-utils)
# For Debian packaging
installPackages+=(sbuild)
installPackages+=(ubuntu-dev-tools)
echo "Running update for apt"
waitLoop

9
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
View File

@ -77,12 +77,15 @@ sudo sbuild-adduser "$LOGNAME"
newgrp sbuild
# Create chroot
#sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64-sbuild http://127.0.0.1:3142/deb.debian.org/debian
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64-sbuild
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64
# For ubuntu 20.04
echo "Create chroot for Ubuntu Focal"
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-amd64 http://archive.ubuntu.com/ubuntu/
echo "Done creating chroot for Ubuntu Focal"
# Update chroot
sudo sbuild-update -udcar stable
sudo sbuild-update -udcar focal