diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-11 09:40:10 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-11 15:13:13 +0100 |
| commit | 19872ea84352182ee974ff84d2e3872a21427117 (patch) | |
| tree | 00caf2a62eb8eb3c4fddb536f559e66ed77428e8 /coin/provisioning/qtci-linux-RHEL-7.4-x86_64 | |
| parent | 271fedaf88465d9b28dd3d2ce74acfc6d05a5633 (diff) | |
| parent | 3e96fec2e148f39a9ec298a60bd331b6c19214da (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.
Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.4-x86_64')
12 files changed, 12 insertions, 12 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index 52ac3d6c..f8847e51 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -36,8 +36,8 @@ set -ex BASEDIR=$(dirname "$0") +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" source $BASEDIR/../common/network_test_server_ip.txt -source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh index bb97d390..d95f4f21 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh @@ -35,7 +35,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" name="p7zip" version="7-11" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh index bf2e1ce9..fa8d3a44 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh @@ -7,4 +7,4 @@ VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" SHA1="bbdbbc0296f42310077539b7247d285386119ef4" -$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" +$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh index 7ce3d514..9800229d 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh @@ -39,4 +39,4 @@ set -ex # CMake is needed for autotests that verify that Qt can be built with CMake -source "${BASH_SOURCE%/*}/../common/cmake_linux.sh" +source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh index c415db3a..970d80b1 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/qnx_700.sh" +source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh index 4f3f4205..1710b878 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/integrity.sh" +source "${BASH_SOURCE%/*}/../common/linux/integrity.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh index d5fe88c7..20e82868 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -35,7 +35,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" packageEpel="epel-release-latest-7.noarch.rpm" OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh index b3cca8f9..e4d2dc15 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/disable_selinux.sh" +source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh index 7ecc470d..b685362e 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh @@ -37,4 +37,4 @@ source /opt/rh/devtoolset-4/enable set -ex -source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" +source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh index 00e1c855..04c09770 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh @@ -33,4 +33,4 @@ ## ############################################################################# -source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh index 7e39935b..ca24a70e 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/fbx_linux.sh +$BASEDIR/../common/linux/fbx_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh index 19e41d46..ffe96d30 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/android_linux.sh" +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" |