diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-20 21:22:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-20 22:33:59 +0100 |
| commit | 91739f5fe3554f0c847346d6011e20de2a24f586 (patch) | |
| tree | 6a6874edbd74692712480ad31bbd102fc2a9ce57 /coin/provisioning/qtci-linux-RHEL-7.4-x86_64 | |
| parent | c64b2415d326f21119399b76549ef9de3195b538 (diff) | |
| parent | e086fbc6cb80b089ed3e336a47e849fc1b5023ca (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
coin/provisioning/common/linux/open62541.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.4-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh | 1 |
2 files changed, 2 insertions, 1 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 a7718d96..bf97a166 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 @@ -51,6 +51,6 @@ gsettings set org.gnome.desktop.screensaver lock-enabled false # disable blank screen power saving gsettings set org.gnome.desktop.session idle-delay 0 -if [ "$proxy" != "" ]; then +if [ "$http_proxy" != "" ]; then echo "proxy=$proxy" | sudo tee -a /etc/yum.conf fi 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 b685362e..9b0cd0f6 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 @@ -32,6 +32,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# +set +e source /opt/rh/devtoolset-4/enable |