diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-09 20:32:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-09 20:32:46 +0100 |
| commit | 37eb5a63b7de731a7beaf908373f0ad4bfa2bc83 (patch) | |
| tree | 96f616818032bda73cfafd28e24804b0e42a38d0 /coin/provisioning/common/linux/openssl_for_android_linux.sh | |
| parent | e49086eb0dfdb0fdbffea883a9b0880284bc7d1f (diff) | |
| parent | 1deea3debce6bfd0fd45545b3a8e1de80380a9a5 (diff) | |
Merge remote-tracking branch 'origin/5.11.3' into 5.11
Change-Id: Iaa9c11ed5435e297e87b225060ea892bdb18deef
Diffstat (limited to 'coin/provisioning/common/linux/openssl_for_android_linux.sh')
| -rwxr-xr-x | coin/provisioning/common/linux/openssl_for_android_linux.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 353722f2..09d0b6d5 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -41,12 +41,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2o" +version="1.0.2p" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" installFolder="/home/qt/" -sha="a47faaca57b47a0d9d5fb085545857cc92062691" +sha="f34b5322e92415755c7d58bf5d0d5cf37666382c" # Until every VM doing Linux Android builds have provisioned the env variable # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. # QTQAINFRA-1436 @@ -56,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" tar -xzf "$targetFile" -C "$installFolder" # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}o" "${opensslHome}" +mv "${opensslHome}p" "${opensslHome}" pushd "$opensslHome" echo "Running configure" |