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.15' into dev

Browse Source 
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/flashing-wizard.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/tqtc-qt-config-gui.yaml
	coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0
This commit is contained in:
Liang Qi
2020-02-28 13:30:25 +01:00
parent aa977addd2 97aa53410e
commit 08e63423e2
146 changed files with 3932 additions and 4212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coin/provisioning/common/linux/android_linux.sh
View File

@@ -37,6 +37,8 @@
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
set -e
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/check_and_set_proxy.sh
@@ -80,8 +82,11 @@ else
sudo chown -R qt:users "$targetFolder"
fi
# Run the following command under `eval` or `sh -c` so that the shell properly splits it
# Stop the sdkmanager from printing thousands of lines of #hashmarks.
# Run the following command under `eval` or `sh -c` so that the shell properly splits it.
sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'"
# But don't let the pipeline hide sdkmanager failures.
set -o pipefail
echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
# shellcheck disable=SC2031

10
coin/provisioning/common/linux/docker.sh
View File

@@ -36,7 +36,9 @@
set -e
. $(dirname "$0")/../../common/unix/DownloadURL.sh
PROVISIONING_DIR="$(dirname "$0")/../../"
. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
localRepo=http://ci-files01-hki.intra.qt.io/input/docker
@@ -52,8 +54,8 @@ do
DownloadURL $localRepo/$f $upstreamRepo/$f $sha
done
sudo apt-get -y install ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb
rm -f ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb
sudo apt-get -y install ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
rm -f ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
sudo usermod -a -G docker $USER
sudo docker --version
@@ -61,7 +63,7 @@ sudo docker --version
# Download and install the docker-compose extension from https://github.com/docker/compose/releases
f=docker-compose-$(uname -s)-$(uname -m)
DownloadURL \
$localRepo/$f \
$localRepo/$f-1.24.1 \
https://github.com/docker/compose/releases/download/1.24.1/$f \
cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a
sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose

16
coin/provisioning/common/linux/gcc.sh
View File

@@ -88,15 +88,15 @@ function InstallGCC() {
# openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
if [ -f "/usr/sbin/update-alternatives" ]; then
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
--slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" \
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" \
--slave /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" \
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}"
else
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
fi
echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf

3
coin/provisioning/common/linux/remove_update-manager.sh
View File

@@ -1,3 +0,0 @@
#!/usr/bin/env bash
sudo apt-get remove update-manager

6
coin/provisioning/common/linux/version.sh
View File

@@ -41,3 +41,9 @@ echo "*********************************************"
echo "***** SW VERSIONS *****"
cat ~/versions.txt
echo "*********************************************"
echo "*************** mount ***********************"
mount
echo "*********************************************"
echo "*************** df **************************"
df -hT
echo "*********************************************"