diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-15 13:38:26 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-16 05:35:10 +0000 |
| commit | 57043fb07bfc30e2f045c2c4ce2cd18fb2a64e48 (patch) | |
| tree | c0160de366a3ff4cc0e9e526bdf86cc01fc8226e /coin | |
| parent | 4b0e2f79c1e7fc8b09a9ea61c78e92581e070c3f (diff) | |
Clean up QNX patching
Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches
from ci-files01 instead.
Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/provisioning/common/patch_qnx.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 index 2fca7b67..632859a0 100644 --- a/coin/provisioning/common/patch_qnx.ps1 +++ b/coin/provisioning/common/patch_qnx.ps1 @@ -44,7 +44,7 @@ $zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" $sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" $tempDir = "C:\temp\qnx_path" -Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip Verify-Checksum $zip $sha1 Extract-Zip $zip $tempDir Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force 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 index 19993ecc..ad5c90d3 100644 --- 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 @@ -60,5 +60,5 @@ function InstallZipPackageFromURL { echo "Patching QNX" -baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip" InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" |