diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-20 21:22:31 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-20 22:33:59 +0100 |
commit | 91739f5fe3554f0c847346d6011e20de2a24f586 (patch) | |
tree | 6a6874edbd74692712480ad31bbd102fc2a9ce57 /coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64 | |
parent | c64b2415d326f21119399b76549ef9de3195b538 (diff) | |
parent | e086fbc6cb80b089ed3e336a47e849fc1b5023ca (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
coin/provisioning/common/linux/open62541.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64')
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 10 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 6c198b1d..e00e2498 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -47,6 +47,7 @@ ExceptionGsettings2=101 ExceptionGsettings3=102 ExceptionNTS=103 ExceptionProxy=104 +ExceptionGrub=105 try ( @@ -58,11 +59,14 @@ try gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2 echo "Disable questions on shutdown." gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3 + echo "Set grub timeout to 0" + sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub || throw $ExceptionGrub + sudo update-grub || throw $ExceptionGrub echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS - if [ "$proxy" != "" ]; then + if [ "$http_proxy" != "" ]; then echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy fi ) @@ -84,6 +88,10 @@ catch || { echo "Failed to disable questions on shutdown." exit 1; ;; + $ExceptionGrub) + echo "Failed to set grub timeout." + exit 1; + ;; $ExceptionNTS) echo "Failed to set network teset server address into /etc/hosts." exit 1; diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 73916cb3..e0e1d1f1 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -99,6 +99,8 @@ try installPackages+=(libgstreamer-plugins-bad1.0-dev) # Support for cross-building to x86 (needed by WebEngine boot2qt builds) installPackages+=(g++-multilib) + # python2 development package + installPackages+=(python-pip) # python3 development package installPackages+=(python3-dev) installPackages+=(python3-pip) |