diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2022-12-07 13:08:37 +0000 |
---|---|---|
committer | Heikki Halmet <heikki.halmet@qt.io> | 2022-12-23 17:45:40 +0000 |
commit | 5880c423c834819306b446f79df15edb361b73c4 (patch) | |
tree | 8bd91701d4e9d49f1cffdd34c6415f64801ee3c1 /coin/provisioning | |
parent | 0dfc13cfaf68a13b08a5223a4908ec6bca0fa4e7 (diff) |
Add RHEL 9 to CI
This will replace RHEL 8
Task-number: QTQAINFRA-5111
Change-Id: Ib65e9b7a2afa85418d5113261bc83ba915b2bce0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'coin/provisioning')
-rwxr-xr-x | coin/provisioning/common/unix/openssl_3_for_android.sh | 55 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh | 2 |
2 files changed, 41 insertions, 16 deletions
diff --git a/coin/provisioning/common/unix/openssl_3_for_android.sh b/coin/provisioning/common/unix/openssl_3_for_android.sh index c82fa51c..30314894 100755 --- a/coin/provisioning/common/unix/openssl_3_for_android.sh +++ b/coin/provisioning/common/unix/openssl_3_for_android.sh @@ -39,7 +39,7 @@ ## ############################################################################# -# This script install prebuilt OpenSSL which was built against Android NDK 21. +# This script install prebuilt OpenSSL which was built against Android NDK 25. # OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories set -ex @@ -48,9 +48,16 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="3.0.3" -: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21 -# Source built requires GCC and Perl to be in PATH. +version="3.0.7" +ndkVersionLatest="r25b" +ndkVersionDefault=$ndkVersionLatest +prebuiltOpensslNdkShaDarwinLatest="5cf5ef6c19e62954ccffcd1e31ac1f331028de0d" +prebuiltOpensslNdkShaLinuxLatest="f5e7e840dc1fac2868033ecfc0eeb79742b0daff" +prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest +prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest + +: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25 +# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd" exports_file="/tmp/export.sh" # source previously made environmental variables. if uname -a |grep -q "Ubuntu"; then @@ -63,10 +70,13 @@ else rm -rf "$exports_file" fi +# ANDROID_NDK_ROOT is required during Configure +export ANDROID_NDK_ROOT=/opt/android/android-ndk-r25b + 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" -sha="1138de3f1a2f573ae69302ab52ecd9bbf5e063ca" +sha="f20736d6aae36bcbfa9aba0d358c71601833bf27" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" @@ -81,18 +91,33 @@ PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm PATH=$TOOLCHAIN:$PATH CC=clang make build_generated ' +function InstallPrebuiltOpenssl() { + + ndkVersion=$1 + nkdSha=$2 + os=$3 + + if [[ ! -d ${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version} ]]; then + prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}-${os}.tar.gz" + targetFile="/tmp/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}-${os}.tar.gz" + + DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$nkdSha" "$targetFile" + tar -xzf "$targetFile" -C "${HOME}" + opensslHome="${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version}" + sudo rm -f $targetFile + fi +} + if uname -a |grep -q "Darwin"; then - prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-3.0.3-for-android-ndk-r23b-darwin.tar.gz" - sha="d204cb4011ba8672aec62ab36a00dd3e32a3a5e9" + InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaDarwinDefault "darwin" + SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome" + InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaDarwinLatest "darwin" + SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome" else - prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-3.0.3-for-android-ndk-r23b-linux.tar.gz" - sha="2d1b6f5d90b5e3ae6a7e2a376250c66e99371485" + InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaLinuxDefault "linux" + SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome" + InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLinuxLatest "linux" + SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome" fi -targetFile="/tmp/prebuilt-openssl-$version.tar.gz" -DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile" -tar -xzf "$targetFile" -C "${HOME}" - -opensslHome="${HOME}/openssl/android/openssl-${version}" -SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" echo "OpenSSL for Android = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh index edc0ddf1..593a4c9a 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. |