VxWorks, QEMU: Remove reference to undefined $appPrefix

install-vxworks-qemu.sh uses a variable that doesn't exist, causing
issues when we turn on more strict error-handling.

Pick-to: 6.10 6.8
Change-Id: I9d644a497e4689c7ab35c80f97548b1a1a6bdf12
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 55c0e2f24a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

cmake/QtIRHelpers.cmake

@@ -130,6 +130,11 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
     set(extra_configure_args "")
     set(extra_cmake_args "")
 
+    # Collect modules to skip. These may come from:
+    # 1. The -skip option (consumed by init-repository's option parser)
+    # 2. Exclusion entries in -submodules/--module-subset (e.g. -qtfoo)
+    qt_ir_get_option_value(skip skip_modules)
+
     # If the -submodules or --module-subset options were specified, transform
     # the values into something configure understands and pass them to configure.
     qt_ir_get_option_value(module-subset submodules)
@@ -153,25 +158,10 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         endif()
 
         list(JOIN include_submodules "," include_submodules)
-        list(JOIN exclude_submodules "," exclude_submodules)
 
-        # Handle case when the -skip argument is already passed.
-        # In that case read the passed values, merge with new ones,
-        # remove both the -skip and its values, and re-add it later.
-        list(FIND filtered_args "-skip" skip_index)
-        if(exclude_submodules AND skip_index GREATER -1)
-            list(LENGTH filtered_args filtered_args_length)
-            math(EXPR skip_args_index "${skip_index} + 1")
-
-            if(skip_args_index LESS filtered_args_length)
-                list(GET filtered_args "${skip_args_index}" skip_args)
-                string(REPLACE "," ";" skip_args "${skip_args}")
-                list(APPEND skip_args ${exclude_submodules})
-                list(REMOVE_DUPLICATES skip_args)
-                list(JOIN skip_args "," exclude_submodules)
-                list(REMOVE_AT filtered_args "${skip_args_index}")
-                list(REMOVE_AT filtered_args "${skip_index}")
-            endif()
+        # Merge exclusions from module-subset into the skip list.
+        if(exclude_submodules)
+            list(APPEND skip_modules ${exclude_submodules})
         endif()
 
         # Handle case when only '-submodules existing' is passed and the
@@ -179,9 +169,13 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         if(include_submodules)
             list(APPEND extra_configure_args "-submodules" "${include_submodules}")
         endif()
-        if(exclude_submodules)
-            list(APPEND extra_configure_args "-skip" "${exclude_submodules}")
-        endif()
+    endif()
+
+    # Forward all collected skip modules to configure.
+    if(skip_modules)
+        list(REMOVE_DUPLICATES skip_modules)
+        list(JOIN skip_modules "," skip_csv)
+        list(APPEND extra_configure_args "-skip" "${skip_csv}")
     endif()
 
     # Insert the extra arguments into the proper positions before and after '--'.

coin/provisioning/common/linux/install-vxworks-qemu.sh

@@ -13,7 +13,7 @@ QEMU_VER="8.2.3"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/qemu/qemu-$QEMU_VER.tar.xz"
 AltUrl="https://download.qemu.org/qemu-$QEMU_VER.tar.xz"
 SHA1="1b29c8105cf8d15b9e7fb6f8e85170b6c54a1788"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" "$appPrefix"
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" ""
 
 targetFolder=/tmp/qemu-${QEMU_VER}
 mkdir -p "$targetFolder/build"

coin/provisioning/common/unix/openssl_for_android.sh

@@ -5,12 +5,14 @@
 # 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
+set -eux
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
+outputPathBase="${HOME}"
+
 sslVersionForLatest="3.0.7"
 ndkVersionLatest="r27c"
 featureSuffixLatest="_16kb"
@@ -63,55 +65,110 @@ PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 EOB
 
+function BuildOutputPath() {
+    local ndkVersion="$1"
+    local suffix="$2"
+    local sslVersion="$3"
+
+    echo "${outputPathBase}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
+}
+
 function InstallPrebuiltOpenssl() {
+    local ndkVersion="$1"
+    local suffix="$2"
+    local sha="$3"
+    local sslVersion="$4"
+    local output_dir="$5"
 
-    ndkVersion=$1
-    suffix=$2
-    sha=$3
-    sslVersion=$4
-
-    renamed_root="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
-
-    prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
-    targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    local prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    local targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
 
     DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
 
+    local tmp_extract
     tmp_extract="$(mktemp -d "${TMPDIR:-/tmp}/openssl-extract.XXXXXX")"
     unzip -q -o "$targetFile" -d "$tmp_extract"
-    sudo rm -f "$targetFile"
+    rm -f "$targetFile"
 
     # We assume there is only one top-level directory in the openssl zip
+    local temp_openssl_root
     temp_openssl_root="$(find "$tmp_extract" -mindepth 1 -maxdepth 1 -type d | head -n 1)"
     if [[ -z "$temp_openssl_root" ]]; then
         echo "ERROR: Expected a single top-level directory in the archive, but none was found." >&2
-        return 1
+        exit 1
     fi
 
-    mv "$temp_openssl_root" "$renamed_root"
+    mv "$temp_openssl_root" "$output_dir"
     rm -rf "$tmp_extract"
 
-    opensslHome="${renamed_root}"
+    # There have been cases where necessary symlinks are lost when unarchiving.
+    # Force-create them now.
+    local abi_list="arm64-v8a armeabi-v7a x86 x86_64"
+    for abi in $abi_list; do
+        ln -fs "${output_dir}/include" "${output_dir}/${abi}/include"
+        ln -fs "${output_dir}/${abi}/libcrypto_3.so" "${output_dir}/${abi}/libcrypto.so"
+        ln -fs "${output_dir}/${abi}/libssl_3.so" "${output_dir}/${abi}/libssl.so"
+    done
 }
 
 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl "$ndkVersionNightly1" "$featureSuffixNightly1" "$prebuiltOpensslShaNightly1" "$sslVersionForNightly1"
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$opensslHome"
-    echo "OpenSSL for Android $ndkVersionNightly1 = $sslVersionForNightly1" >> ~/versions.txt
+    outputDirNightly1=$(BuildOutputPath \
+        "$ndkVersionNightly1" \
+        "$featureSuffixNightly1" \
+        "$sslVersionForNightly1")
+
+    InstallPrebuiltOpenssl \
+        "$ndkVersionNightly1" \
+        "$featureSuffixNightly1" \
+        "$prebuiltOpensslShaNightly1" \
+        "$sslVersionForNightly1" \
+        "$outputDirNightly1"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly1"
+    echo "OpenSSL for Android ${ndkVersionNightly1} = ${sslVersionForNightly1}" >> ~/versions.txt
 fi
 
 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl "$ndkVersionNightly2" "$featureSuffixNightly2" "$prebuiltOpensslShaNightly2" "$sslVersionForNightly2"
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY2" "$opensslHome"
-    echo "OpenSSL for Android $ndkVersionNightly2 = $sslVersionForNightly2" >> ~/versions.txt
+    outputDirNightly2=$(BuildOutputPath \
+        "$ndkVersionNightly2" \
+        "$featureSuffixNightly2" \
+        "$sslVersionForNightly2")
+
+    InstallPrebuiltOpenssl \
+        "$ndkVersionNightly2" \
+        "$featureSuffixNightly2" \
+        "$prebuiltOpensslShaNightly2" \
+        "$sslVersionForNightly2" \
+        "$outputDirNightly2"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly2"
+    echo "OpenSSL for Android ${ndkVersionNightly2} = ${sslVersionForNightly2}" >> ~/versions.txt
 fi
 
 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl "$ndkVersionPreview" "$featureSuffixPreview" "$prebuiltOpensslShaPreview" "$sslVersionForPreview"
-    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$opensslHome"
-    echo "OpenSSL for Android $ndkVersionPreview = $sslVersionForPreview" >> ~/versions.txt
+    outputDirPreview="$(BuildOutputPath \
+        "$ndkVersionPreview" \
+        "$featureSuffixPreview" \
+        "$sslVersionForPreview")"
+
+    InstallPrebuiltOpenssl \
+        "$ndkVersionPreview" \
+        "$featureSuffixPreview" \
+        "$prebuiltOpensslShaPreview" \
+        "$sslVersionForPreview" \
+        "$outputDirPreview"
+    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$outputDirPreview"
+    echo "OpenSSL for Android ${ndkVersionPreview} = ${sslVersionForPreview}" >> ~/versions.txt
 fi
 
-InstallPrebuiltOpenssl "$ndkVersionLatest" "$featureSuffixLatest" "$prebuiltOpensslShaLatest" "$sslVersionForLatest"
-SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
-echo "OpenSSL for Android $ndkVersionLatest = $sslVersionForLatest" >> ~/versions.txt
+outputDirLatest="$(BuildOutputPath \
+    "$ndkVersionLatest" \
+    "$featureSuffixLatest" \
+    "$sslVersionForLatest")"
+
+InstallPrebuiltOpenssl \
+    "$ndkVersionLatest" \
+    "$featureSuffixLatest" \
+    "$prebuiltOpensslShaLatest" \
+    "$sslVersionForLatest" \
+    "$outputDirLatest"
+SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$outputDirLatest"
+echo "OpenSSL for Android ${ndkVersionLatest} = ${sslVersionForLatest}" >> ~/versions.txt

coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh

@@ -252,6 +252,8 @@ installPackages+=(libusb-1.0-0-dev)
 # password management support for Qt Creator
 installPackages+=(libsecret-1-dev)
 installPackages+=(debian-archive-keyring)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 
 echo "Running update for apt"

coin/provisioning/qtci-linux-RHEL-10.0-x86_64/04-install-packages.sh

@@ -161,6 +161,8 @@ installPackages+=(perl-JSON)
 installPackages+=(perl-Test-Simple) # To install Test::More module for SBOM
 # For qtgrpc build
 installPackages+=(zlib-static)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh

@@ -155,6 +155,8 @@ installPackages+=(perl-IPC-Cmd)
 installPackages+=(libsecret-devel)
 # For tst_license.pl with all the machines generating SBOM
 installPackages+=(perl-JSON)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"