diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index d442cb64..6a15397e 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -33,12 +33,12 @@ Configurations: ] - Id: 'android-9-x86-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Template: 'qtci-linux-RHEL-9.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-8.10' + Platform dependency: 'rhel-9.4' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', @@ -49,12 +49,12 @@ Configurations: ] - Id: 'android-16-x86_64-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Template: 'qtci-linux-RHEL-9.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-8.10' + Platform dependency: 'rhel-9.4' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index 248b1f7b..5878783f 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -2,12 +2,12 @@ Version: 2 Configurations: - Id: 'android-x86-developer-build-testrun-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Template: 'qtci-linux-RHEL-9.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-8.10' + Platform dependency: 'rhel-9.4' Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index deed79bc..4b0b5cf8 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -2,13 +2,13 @@ Version: 2 Configurations: - Id: 'android-9-multi-abi' - Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Template: 'qtci-linux-RHEL-9.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: [ - 'rhel-8.10', + 'rhel-9.4', 'android-9-x86-on-linux', 'android-16-x86_64-on-linux' ] @@ -20,7 +20,7 @@ Configurations: 'InstallDepsPerPlatformSubdir' ] Environment variables: [ - 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10', + 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.4', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux', 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', diff --git a/coin/platform_configs/nightly_android_namespace.yaml b/coin/platform_configs/nightly_android_namespace.yaml index 42322185..8d35b84d 100644 --- a/coin/platform_configs/nightly_android_namespace.yaml +++ b/coin/platform_configs/nightly_android_namespace.yaml @@ -1,7 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - 'rhel-8.10' + 'rhel-9.4' ], cmake_platforms_target_android.yaml: [ 'android-15-x86_64-on-linux', diff --git a/coin/platform_configs/nightly_android_ndk1.yaml b/coin/platform_configs/nightly_android_ndk1.yaml index 2e86a934..c7262d10 100644 --- a/coin/platform_configs/nightly_android_ndk1.yaml +++ b/coin/platform_configs/nightly_android_ndk1.yaml @@ -1,7 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - 'rhel-8.10', + 'rhel-9.4', 'windows-11_24h2-mingw13' ], cmake_platforms_target_android.yaml: [ diff --git a/coin/platform_configs/nightly_android_ndk2.yaml b/coin/platform_configs/nightly_android_ndk2.yaml index 0fb78c5b..1585a4b1 100644 --- a/coin/platform_configs/nightly_android_ndk2.yaml +++ b/coin/platform_configs/nightly_android_ndk2.yaml @@ -1,7 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - 'rhel-8.10', + 'rhel-9.4', 'windows-11_24h2-mingw13' ], cmake_platforms_target_android.yaml: [ diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 38585f12..fc4b95e2 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -2,7 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ "documentation-warnings", - "rhel-8.10", + "rhel-9.4", 'windows-11_24h2-mingw13', ], macos.yaml: [ @@ -19,12 +19,12 @@ Include: [ Configurations: - Id: "automotive-android-14-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Template: 'qtci-linux-RHEL-9.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-8.10' + Platform dependency: 'rhel-9.4' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', @@ -35,12 +35,12 @@ Configurations: ] - Id: "automotive-android-10-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Template: 'qtci-linux-RHEL-9.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-8.10' + Platform dependency: 'rhel-9.4' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', diff --git a/coin/provisioning/common/unix/install-patchelf.sh b/coin/provisioning/common/unix/install-patchelf.sh index ce15d239..3c78be23 100755 --- a/coin/provisioning/common/unix/install-patchelf.sh +++ b/coin/provisioning/common/unix/install-patchelf.sh @@ -15,14 +15,21 @@ sha1="ddd46a2e2a16a308245c008721d877455b23bba8" target_source_dir="$HOME/patchelf-$patchelf_version" if [ ! -d "$target_source_dir" ]; then - InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$HOME" "" + InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$HOME" "" fi -pushd "$target_source_dir" +pushd "$target_source_dir" || exit ./bootstrap.sh ./configure make sudo make install -popd +popd || exit + +if [[ "$(uname -s)" = "Linux" && -f /etc/redhat-release ]]; then + # RHEL-9 with sudo or non-interactive shells do not include /usr/local/bin/ in PATH + # Add a symlink so patchelf is found in later scripts + echo "Creating symlink for patchelf in /usr/bin" + sudo ln -sf /usr/local/bin/patchelf /usr/bin/patchelf +fi diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh index 882680b7..467c6acc 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" "use_16kb_page_size" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86" "use_4kb_page_size"