lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-26 22:58:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.12' into dev

Browse Source 
Conflicts:
	coin/platform_configs/default.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: Ie454d4eff0317cea2fec6870b5ca53f36ad2f191
This commit is contained in:
Liang Qi
2018-10-07 12:49:14 +02:00
parent 4e8b5bae5b 7b9c3ced84
commit 9bfa486dd0
6 changed files with 65 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
View File

@@ -44,6 +44,19 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai
sudo systemctl stop $service
sudo systemctl disable $service
done
function set_internal_repo {
sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-updates main restricted universe multiverse
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-backports main restricted universe
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-security main restricted universe multiverse
EOC
}
(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
# Git is not needed by builds themselves, but is nice to have
# immediately as one starts debugging
installPackages+=(git)
@@ -150,12 +163,12 @@ installPackages+=(chrpath)
installPackages+=(gawk)
installPackages+=(texinfo)
echo "Installing packages"
waitLoop
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
echo "Running update for apt"
waitLoop
sudo apt-get update
echo "Installing packages"
waitLoop
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
# Install all needed packages in a special wheel cache directory
pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt