diff options
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh) | 32 |
1 files changed, 2 insertions, 30 deletions
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/22-mqtt_broker.sh index 6f998a60..04c09770 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## 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. @@ -33,32 +33,4 @@ ## ############################################################################# -# 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/" +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" |