diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-07 09:36:59 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-07 09:37:28 +0100 |
commit | 25a0f1fa08fcb127ec138f0f457feaad53c27534 (patch) | |
tree | 7fdf319d8e531b0932687e99a9e7e904b8c48f9a /coin/provisioning/common/unix | |
parent | 532f1dea57210970cb8449fbb94f46e356706163 (diff) | |
parent | 9a160d28d57605db98353740523d086ea5c5446d (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.10.1
Change-Id: I275589752f6f623e61841a4552087a1875729615
Diffstat (limited to 'coin/provisioning/common/unix')
-rwxr-xr-x | coin/provisioning/common/unix/disable-ntp_macos.sh | 40 | ||||
-rw-r--r-- | coin/provisioning/common/unix/mqtt_broker.sh | 9 |
2 files changed, 46 insertions, 3 deletions
diff --git a/coin/provisioning/common/unix/disable-ntp_macos.sh b/coin/provisioning/common/unix/disable-ntp_macos.sh new file mode 100755 index 00000000..581ea7cb --- /dev/null +++ b/coin/provisioning/common/unix/disable-ntp_macos.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 + +echo "Disable Network Time Protocol (NTP)" +echo "sudo launchctl unload /System/Library/LaunchDaemons/org.ntp.ntpd.plist" >> /Users/qt/.bash_profile + diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index c2fb2e30..c64c0fec 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -37,10 +37,11 @@ # shellcheck source=./InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" -PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" -AltUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" SHA1="532fe145096cdd8d679f425cbfd883289150c968" targetFolder="/opt/paho_broker" appPrefix="paho.mqtt.testing-$CommitSHA" @@ -49,4 +50,6 @@ sudo rm -fr "$targetFolder" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding MQTT broker path to environment" -sed -i "1iexport MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" ~/.bashrc +SetEnvVar "MQTT_TEST_BROKER_LOCATION" "$targetFolder/interoperability/startbroker.py" + +echo "MQTT_BROKER = $CommitSHA" >> ~/versions.txt |