From b16eac13e6f65f338ec9e78ce4a926edadde8efb Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Wed, 13 Dec 2017 13:22:26 +0200
Subject: Provisioning: Remove Android script from Red Hat 6.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Android linux builds are run by Red Hat 7.4

Change-Id: I8661b90494c1d43cc87e50136ed185fac93e4916
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 .../qtci-linux-RHEL-6.6-x86_64/android_linux.sh    | 120 ---------------------
 1 file changed, 120 deletions(-)
 delete mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh

(limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')

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
-- 
cgit v1.2.3


From ca89bec297612752a7f9c6015f236631e1401e92 Mon Sep 17 00:00:00 2001
From: Joni Jantti <joni.jantti@qt.io>
Date: Wed, 27 Dec 2017 12:22:57 +0200
Subject: Add set -ex to provisioning scripts for RHEL 6.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I6e6e66cffcbd84af1e093176d65751063492122b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 .../qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh      | 3 +++
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh                | 3 +++
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh            | 2 ++
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh           | 3 +++
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh               | 2 ++
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh                 | 3 +++
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh                | 3 +++
 7 files changed, 19 insertions(+)

(limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')

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..59fd541f 100644
--- 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
@@ -2,5 +2,8 @@
 # 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..4e4fb462 100644
--- 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,7 @@
 # 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..5248f86f 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,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/sw_versions.txt
 VERSION=$libclang_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..43ba9ecd 100644
--- 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,9 @@
 # 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..5c88e498 100644
--- 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,3 @@
+set -ex
+
 $(dirname $0)/../common/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/libusb.sh
index 229e259f..1831ea52 100644
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh
@@ -1,3 +1,6 @@
 #!/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/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
index 5ef5f0e9..836f6ec4 100644
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
@@ -36,6 +36,9 @@
 # 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
-- 
cgit v1.2.3


From 19f8a741f3556271dc4ef598bbf725f89b733b6a Mon Sep 17 00:00:00 2001
From: Joni Jantti <joni.jantti@qt.io>
Date: Wed, 27 Dec 2017 11:12:09 +0200
Subject: Make provisioning script prefix style match across platforms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently we are using different styles and amount of digits for the
provisioning script prefixes. This change will unify them across the
platforms. Also removes a couple of duplicate files.

Task-number: QTQAINFRA-1668
Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 .../qtci-linux-RHEL-6.6-x86_64/20-libusb.sh        |  6 ++
 .../qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh   | 73 ++++++++++++++++++++++
 .../qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh     | 64 +++++++++++++++++++
 .../qtci-linux-RHEL-6.6-x86_64/99-version.sh       | 47 ++++++++++++++
 .../qtci-linux-RHEL-6.6-x86_64/install_icu.sh      | 73 ----------------------
 .../qtci-linux-RHEL-6.6-x86_64/libusb.sh           |  6 --
 .../qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh        | 64 -------------------
 .../qtci-linux-RHEL-6.6-x86_64/version.sh          | 47 --------------
 8 files changed, 190 insertions(+), 190 deletions(-)
 create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
 create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
 create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh
 create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
 delete mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
 delete mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh
 delete mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
 delete mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh

(limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')

diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
new file mode 100644
index 00000000..1831ea52
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
@@ -0,0 +1,6 @@
+#!/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/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
new file mode 100644
index 00000000..03a69edb
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
@@ -0,0 +1,73 @@
+#!/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 installs the right ICU version
+
+set -ex
+icuVersion="56.1"
+icuLocation="/usr/lib64"
+sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
+
+function Install7ZPackageFromURL {
+    url=$1
+    expectedSha1=$2
+    targetDirectory=$3
+
+    targetFile=`mktemp`
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
+    echo "$expectedSha1  $targetFile" | sha1sum --check
+    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile
+    rm $targetFile
+}
+
+echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
+
+baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
+Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
+
+echo "Installing custom ICU devel packages on RHEL"
+
+sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
+develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
+tempDir=`mktemp -d`
+trap "sudo rm -fr $tempDir" EXIT
+Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
+sudo cp -a $tempDir/lib/* /usr/lib64
+sudo cp -a $tempDir/* /usr/
+
+sudo /sbin/ldconfig
+
+# Storage version information to ~/versions.txt, which is used to print version information to provision log.
+echo "ICU = $icuVersion" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh
new file mode 100644
index 00000000..27c7137b
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh
@@ -0,0 +1,64 @@
+#!/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$
+##
+#############################################################################
+
+# Patch QNX SDK due to issues in the standard library.
+# The patches are available here:
+# http://www.qnx.com/download/feature.html?programid=27555
+# A copy of the patch must be in the root of the Coin path in
+# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
+
+set -ex
+sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"
+
+function InstallZipPackageFromURL {
+    url=$1
+    expectedSha1=$2
+    targetDirectory=$3
+
+    targetFile=`mktemp`
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
+    echo "$expectedSha1  $targetFile" | sha1sum --check
+
+    tempDir=`mktemp -d`
+    /usr/bin/unzip -o -d $tempDir $targetFile
+    trap "sudo rm -fr $targetFile $tempDir" EXIT
+
+    sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/
+}
+
+echo "Patching QNX"
+
+baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip"
+InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
new file mode 100644
index 00000000..836f6ec4
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
@@ -0,0 +1,47 @@
+#!/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 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
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/install_icu.sh
deleted file mode 100644
index 03a69edb..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
+++ /dev/null
@@ -1,73 +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 installs the right ICU version
-
-set -ex
-icuVersion="56.1"
-icuLocation="/usr/lib64"
-sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
-
-function Install7ZPackageFromURL {
-    url=$1
-    expectedSha1=$2
-    targetDirectory=$3
-
-    targetFile=`mktemp`
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
-    echo "$expectedSha1  $targetFile" | sha1sum --check
-    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile
-    rm $targetFile
-}
-
-echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
-
-baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
-Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
-
-echo "Installing custom ICU devel packages on RHEL"
-
-sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
-develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
-tempDir=`mktemp -d`
-trap "sudo rm -fr $tempDir" EXIT
-Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
-sudo cp -a $tempDir/lib/* /usr/lib64
-sudo cp -a $tempDir/* /usr/
-
-sudo /sbin/ldconfig
-
-# Storage version information to ~/versions.txt, which is used to print version information to provision log.
-echo "ICU = $icuVersion" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh
deleted file mode 100644
index 1831ea52..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
deleted file mode 100644
index 27c7137b..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
+++ /dev/null
@@ -1,64 +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$
-##
-#############################################################################
-
-# Patch QNX SDK due to issues in the standard library.
-# The patches are available here:
-# http://www.qnx.com/download/feature.html?programid=27555
-# A copy of the patch must be in the root of the Coin path in
-# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
-
-set -ex
-sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"
-
-function InstallZipPackageFromURL {
-    url=$1
-    expectedSha1=$2
-    targetDirectory=$3
-
-    targetFile=`mktemp`
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
-    echo "$expectedSha1  $targetFile" | sha1sum --check
-
-    tempDir=`mktemp -d`
-    /usr/bin/unzip -o -d $tempDir $targetFile
-    trap "sudo rm -fr $targetFile $tempDir" EXIT
-
-    sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/
-}
-
-echo "Patching QNX"
-
-baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip"
-InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
deleted file mode 100644
index 836f6ec4..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
+++ /dev/null
@@ -1,47 +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 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
-- 
cgit v1.2.3


From b9aae857f9e2dbcc444a099a8345dc8ac31ff47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= <tony.sarajarvi@qt.io>
Date: Fri, 29 Dec 2017 10:14:10 +0200
Subject: Fix shebangs and give provisioning scripts +x rights
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 .../qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh       | 1 +
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh                 | 1 +
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh            | 1 +
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh                | 1 +
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh               | 2 +-
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh          | 2 +-
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh            | 2 +-
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh              | 2 +-
 8 files changed, 8 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh
 mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh
 mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
 mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
 mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
 mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
 mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh
 mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh

(limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')

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
old mode 100644
new mode 100755
index 59fd541f..d3072b37
--- 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,3 +1,4 @@
+#!/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
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
old mode 100644
new mode 100755
index 4e4fb462..c8edc2a2
--- 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,3 +1,4 @@
+#!/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
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
old mode 100644
new mode 100755
index 43ba9ecd..552e7586
--- 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,3 +1,4 @@
+#!/usr/bin/env bash
 # provides: python development libraries
 # version: provided by default Linux distribution repository
 # needed to build pyside
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
old mode 100644
new mode 100755
index 5c88e498..00b57918
--- 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,3 +1,4 @@
+#!/usr/bin/env bash
 set -ex
 
 $(dirname $0)/../common/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
old mode 100644
new mode 100755
index 1831ea52..b156e8f9
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 # Required for tqtc-boot2qt/qdb
 
 set -ex
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
old mode 100644
new mode 100755
index 03a69edb..e4492eb0
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-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/50-patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh
old mode 100644
new mode 100755
index 27c7137b..6f998a60
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
old mode 100644
new mode 100755
index 836f6ec4..fb3e9642
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-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
 
 #############################################################################
 ##
-- 
cgit v1.2.3


From 4fb893fcf8ef55ff3ebbdf684c4d1cfab913cea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= <tony.sarajarvi@qt.io>
Date: Fri, 29 Dec 2017 10:22:08 +0200
Subject: Set up proxy for provisioning scripts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTQAINFRA-1669
Change-Id: I582dc5037bd2b46dcd5c9c3b2cb13784e122d6a5
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 .../qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh   | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh

(limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')

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..945d2e99
--- /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/check_and_set_proxy.sh"
+
+if [ "$proxy" != "" ]; then
+    echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
+fi
-- 
cgit v1.2.3


From 84899eca4c6dcc6def56abae781e5489c4f950a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= <tony.sarajarvi@qt.io>
Date: Wed, 3 Jan 2018 08:13:36 +0200
Subject: Consolidate prefixes of provisioning scripts

Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
---
 .../qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh   | 36 ++++++++++++++++++++++
 .../qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh      | 36 ----------------------
 2 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh
 delete mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh

(limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')

diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh
new file mode 100644
index 00000000..e367c20b
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh
@@ -0,0 +1,36 @@
+#!/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 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$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"
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/mqtt_broker.sh
deleted file mode 100644
index e367c20b..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"
-- 
cgit v1.2.3


From 2fe8d370e6700aa380669104ca18d2f1d14dc22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= <tony.sarajarvi@qt.io>
Date: Wed, 3 Jan 2018 08:18:34 +0200
Subject: Add +x rights to provisioning scrips missing it and consolidate
 shebang
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I1e1fb37bfffd0451c02166227805b40b48d31582
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
---
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh

(limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')

diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh
old mode 100644
new mode 100755
index e367c20b..00e1c855
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-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
 
 #############################################################################
 ##
-- 
cgit v1.2.3


From 2a28ce864bed677e4ac2477eedf6bee498075d94 Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Thu, 2 Nov 2017 16:09:11 +0200
Subject: Split Common folder based on operating system families
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes

Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
---
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | 2 +-
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh    | 2 +-
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh       | 2 +-
 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')

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
index 945d2e99..90b32d0d 100755
--- 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
@@ -35,7 +35,7 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
 if [ "$proxy" != "" ]; then
     echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
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 5248f86f..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
@@ -8,4 +8,4 @@ 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/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
index 00b57918..572ad7ad 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,4 +1,4 @@
 #!/usr/bin/env bash
 set -ex
 
-$(dirname $0)/../common/cmake_linux.sh
+$(dirname $0)/../common/linux/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
index fb3e9642..739d06b6 100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
@@ -44,4 +44,4 @@ 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
-- 
cgit v1.2.3