diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-12 12:51:53 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-12 21:13:56 +0100 |
commit | c2d188f225a96ccf409f4dbebd19f6e59caf7da6 (patch) | |
tree | 35d0320171ad60a4e25c41f0718d02016dfd4242 /coin/provisioning/qtci-linux-RHEL-6.6-x86_64 | |
parent | ab25cb7af6602a558c84e3d30e8ce1c6e7ca6e73 (diff) | |
parent | 19872ea84352182ee974ff84d2e3872a21427117 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')
11 files changed, 73 insertions, 128 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..90b32d0d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +if [ "$proxy" != "" ]; then + echo "proxy=$proxy" | sudo tee -a /etc/yum.conf +fi diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh index 852c1100..d3072b37 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh @@ -1,6 +1,10 @@ +#!/usr/bin/env bash # provides: fix for possible bug in the subscription manager # version: provided by RedHat # needed for yum to work properly in case there is incorrect data in # the sslclientkey repository parameter value + +set -ex + sudo rm -f /etc/pki/entitlement/* sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh index f6c90a75..c8edc2a2 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh @@ -1,4 +1,8 @@ +#!/usr/bin/env bash # provides: odbc devel packages on RHEL # version: provided by default Linux distribution repository # needed for configure -plugin-sql-odbc in qtbase + +set -ex + sudo yum install -y unixODBC-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index aa64a892..b418ed8b 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -1,9 +1,11 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") . $BASEDIR/../common/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" -$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" +$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh index 0003127a..552e7586 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -1,6 +1,10 @@ +#!/usr/bin/env bash # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside + +set -ex + sudo yum install -y python-devel python-virtualenv # install the EPEL repository which provides python3 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index d7abd285..572ad7ad 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1 +1,4 @@ -$(dirname $0)/../common/cmake_linux.sh +#!/usr/bin/env bash +set -ex + +$(dirname $0)/../common/linux/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh index 229e259f..b156e8f9 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh @@ -1,3 +1,6 @@ -#!/bin/env bash +#!/usr/bin/env bash # Required for tqtc-boot2qt/qdb + +set -ex + sudo yum install -y libusb1-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh index e367c20b..04c09770 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## @@ -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-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh index 03a69edb..e4492eb0 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh index 5ef5f0e9..739d06b6 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## @@ -36,9 +36,12 @@ # This script needs to be called last during provisioning so that the software information will show up last in provision log. # Storage installed RPM packages information + +set -ex + echo "*********************************************" >> ~/versions.txt echo "***** All installed RPM packages *****" >> ~/versions.txt rpm -q -a | sort >> ~/versions.txt echo "*********************************************" >> ~/versions.txt -$(dirname $0)/../common/version.sh +$(dirname $0)/../common/linux/version.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh deleted file mode 100644 index 69b3c10e..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install Android sdk and ndk. - -# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3 - -# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. - -# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. -# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. -# That's why we need to use Andoid-21 API version in Qt 5.9. - -set -ex -targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.intra.qt.io/input/android" - -# SDK -sdkPackage="android-sdk_r24.4.1-linux.tgz" -sdkBuildToolsVersion="23.0.3" -sdkApiLevel="android-21" -sdkUrl="$baseUrl/$sdkPackage" -sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" -sdkTargetFile="$targetFolder/$sdkPackage" -sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" -sdkFolderName="android-sdk-linux" -sdkName="sdk" - -# NDK -ndkVersion="r10e" -ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip" -ndkUrl="$baseUrl/$ndkPackage" -ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" -ndkTargetFile="$targetFolder/$ndkPackage" -ndkExtract="unzip $ndkTargetFile -d $targetFolder" -ndkFolderName="android-ndk-$ndkVersion" -ndkName="ndk" - -function InstallAndroidPackage { - targetFolder=$1 - version=$2 - url=$3 - sha1=$4 - targetFile=$5 - extract=$6 - folderName=$7 - name=$8 - - sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" - echo "$sha1 $targetFile" | sha1sum --check - sudo chmod 755 "$targetFile" - sudo $extract || echo "Failed to extract $url" - sudo chown -R qt:users "$targetFolder"/"$folderName" - sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name" - sudo rm -fr "$targetFolder"/"$version" -} - -if [ -d "$targetFolder" ]; then - echo "Removing old Android installation" - sudo rm -fr "$targetFolder" -fi - -sudo mkdir "$targetFolder" - -# Install Android SDK -echo "Installing Android SDK version $sdkPackage..." -InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName - -# Install Android NDK -echo "Installing Android NDK version $ndkPackage..." -InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName - -# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools -echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." -echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion - -echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc - -# Storage version information to ~/versions.txt, which is used to print version information to provision log. -echo "***** Android SDK *****" >> ~/versions.txt -echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt -echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt -platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)" -echo "Android Platform Tools = $platformTools" >> ~/versions.txt -sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)" -echo "Android SDK Tools = $sdkTools" >> ~/versions.txt -echo "***** Android NDK *****" >> ~/versions.txt -echo "Android NDK Version = $ndkVersion" >> ~/versions.txt |