diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2023-01-20 06:03:34 +0000 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-24 05:47:00 +0000 |
commit | 8e435d92df896eda36190b12f68347601d6c368e (patch) | |
tree | 9a1c75bcb8efc7e05f2fdf8070d57cb93d4e01c2 /coin | |
parent | f01a4281d66246511da147420753100e3c2d2265 (diff) |
Revert back to use RHEL 8.4 with Android targets
RHEL-9 is causing problems in QtApplicationmanager when using
RHEL-8.4 as a host build: It can't load libcrypto in Android
build phase
Task-number: QTBUG-110172
Change-Id: I6d5ef4684fb11e384eb54f9a37bd30e4ef8d145b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 7ac39979ce0714399171cdf848745db25e7b6b79)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
6 files changed, 11 insertions, 11 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 76bd29df..f412c30f 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -37,7 +37,7 @@ Configurations: ] - Id: 'android-x86-on-linux' - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' @@ -55,7 +55,7 @@ Configurations: ] - Id: 'android-x86_64-on-linux' - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/cmake_platforms_target_android_12.yaml b/coin/platform_configs/cmake_platforms_target_android_12.yaml index bf748603..5e3a6c77 100644 --- a/coin/platform_configs/cmake_platforms_target_android_12.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_12.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'android-12-x86_64-on-linux' - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml index 3479ce52..13d0cea3 100644 --- a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index bed08bec..83348c62 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'android-x86-developer-build-testrun-on-linux' - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index df6be290..58042f0f 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -1,8 +1,8 @@ Version: 2 Configurations: - - Id: 'rhel_9.0_android_multi' - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Id: 'rhel_8.4_android_multi' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'GCC' diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index a66f7bc4..d35087df 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -33,8 +33,8 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang' ] - - Id: 'rhel-9.0' - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Id: 'rhel-8.4' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure'] Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' @@ -44,12 +44,12 @@ Configurations: ] - Id: "automotive-android-x86-on-linux" - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-9.0' + Platform dependency: 'rhel-8.4' Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', |