From 319cbd99c89fc242e0444887917eaa953eb26cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marianne=20Yrj=C3=A4n=C3=A4?= Date: Fri, 5 Apr 2024 13:29:25 +0300 Subject: [PATCH] Update QNX7.1 toolchain for CI Pick-to: 6.7 6.5 6.2 Change-Id: I807fbfd468331a08b0672c4b2f02da1208470bf1 Reviewed-by: Toni Saario --- coin/provisioning/common/linux/qnx_710.sh | 4 ++-- .../qnx_qemu_build_files/local/snippets/system_files.custom | 2 +- coin/provisioning/common/windows/qnx710.ps1 | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/linux/qnx_710.sh b/coin/provisioning/common/linux/qnx_710.sh index 7afefb42..41d2d103 100755 --- a/coin/provisioning/common/linux/qnx_710.sh +++ b/coin/provisioning/common/linux/qnx_710.sh @@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then fi # QNX SDP -sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz" +sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20240417.tar.xz" targetFile="qnx710.tar.xz" -sha1="134af2e0f75d7b7c516f824fafee265b89e51d48" +sha1="cd2d35004fb2798089e29d9e1226691426632da0" DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder" sudo cp "$aarch64le_toolchain" "$targetPath" diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom index da00c4e9..37cbd96d 100644 --- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom @@ -21,7 +21,7 @@ lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1 lib/libEGL.so.1=usr/lib/libEGL.so.1 lib/libz.so.2=usr/lib/libz.so.2 lib/libxml2.so.2=usr/lib/libxml2.so.2 -lib/libfreetype.so.23=usr/lib/libfreetype.so.23 +lib/libfreetype.so.24=usr/lib/libfreetype.so.24 lib/libbz2.so.1=usr/lib/libbz2.so.1 lib/liblzma.so.5=usr/lib/liblzma.so.5 lib/libbacktrace.so.1=usr/lib/libbacktrace.so.1 diff --git a/coin/provisioning/common/windows/qnx710.ps1 b/coin/provisioning/common/windows/qnx710.ps1 index 3c8f2257..c720619c 100644 --- a/coin/provisioning/common/windows/qnx710.ps1 +++ b/coin/provisioning/common/windows/qnx710.ps1 @@ -28,10 +28,10 @@ $folderName = "qnx710" $targetPath = "$targetFolder$folderName" # QNX SDP -$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx710-windows-linux-20220405.tar.xz" -$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz" +$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx710-windows-linux-20240417.tar.xz" +$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20240417.tar.xz" $targetFile = "qnx710.tar.xz" -$sha1 = "134af2e0f75d7b7c516f824fafee265b89e51d48" +$sha1 = "cd2d35004fb2798089e29d9e1226691426632da0" DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl Copy-Item $aarch64le_toolchain $targetPath