diff options
author | Liang Qi <liang.qi@qt.io> | 2019-09-23 16:38:06 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-23 16:38:06 +0200 |
commit | 44073f55632e7848d372a60c4417bbc8664afd2c (patch) | |
tree | 6fcebed721da0d0049ae1413538e8f6bf9dfbf92 /coin/provisioning/qtci-linux-openSUSE-15.0-x86_64 | |
parent | 709e687c84c67ba8faf2411c081b29f25d76de4e (diff) | |
parent | fd87ff83aafc0f103538376591e9f36dfeb1410d (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-15.0-x86_64')
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh | 6 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh index 09a76778..44cf1b80 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh @@ -35,5 +35,5 @@ set -ex -# shellcheck source=../common/linux/emsdk.sh -source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" |