From fe897cd2bc16b44bdd73f5fd8855938d5e12b103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 22 Jul 2026 12:15:19 +0300 Subject: [PATCH] Provisioning: Fix 7z extract commands on RHEL 9.6 More recent 7z requires additional switch due to multi hop links. Change-Id: Ia023bf8d662d4c842acc97498e0b89cf2a2a167d Reviewed-by: Matti Paaso (cherry picked from commit dd13fa7b41c46616c7574d1857c9a5b81e00fc56) Reviewed-by: Jani Heikkinen --- .../qtci-linux-RHEL-9.6-x86_64/05-libclang-dyn.sh | 4 ++-- coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang.sh | 2 +- .../provisioning/qtci-linux-RHEL-9.6-x86_64/30-install_icu.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang-dyn.sh b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang-dyn.sh index dbf0d086..0e3b65ea 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang-dyn.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang-dyn.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#Copyright (C) 2026 The Qt Company Ltd #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only set -ex BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/libclang-dyn.sh -"$BASEDIR/../common/unix/libclang-dyn.sh" +"$BASEDIR/../common/unix/libclang-dyn.sh" "-snld20" diff --git a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang.sh index cc68ed1f..4e88a5c5 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang.sh @@ -5,4 +5,4 @@ set -ex BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/libclang.sh -"$BASEDIR/../common/unix/libclang.sh" +"$BASEDIR/../common/unix/libclang.sh" "-snld20" diff --git a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/30-install_icu.sh index 8d365c9d..0648859e 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/30-install_icu.sh @@ -23,7 +23,7 @@ echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" targetFile=$(mktemp) DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" -sudo 7z x -y -o/usr/lib64 "$targetFile" +sudo 7z x -snld20 -y -o/usr/lib64 "$targetFile" sudo rm "$targetFile" echo "Installing custom ICU devel packages on RHEL" @@ -32,7 +32,7 @@ tempDir=$(mktemp -d) targetFile=$(mktemp) DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" -7z x -y -o"$tempDir" "$targetFile" +7z x -snld20 -y -o"$tempDir" "$targetFile" sudo cp -a "$tempDir"/lib/* /usr/lib64 sudo cp -a "$tempDir"/* /usr/