From 24348fe918eb9e6c4a343461cff355800a0f2146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marianne=20Yrj=C3=A4n=C3=A4?= Date: Wed, 13 May 2026 13:14:03 +0300 Subject: [PATCH] CI: Update QNX7.1 toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Toolchain updated to newer version and related library version updates done. Added sshd-session as it's now needed by SSH Daemon. Pick-to: 6.11 6.8 Change-Id: Iebf22f27c33709902485bd034c9442659c1b54cc Reviewed-by: Simo Fält (cherry picked from commit 14aeaae7de3556d2428ecbb7d471d14f64bea51b) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/qnx_710.sh | 4 ++-- .../710/local/snippets/data_files.custom | 2 +- .../710/local/snippets/ifs_files.custom | 3 +++ .../710/local/snippets/post_start.custom | 2 ++ .../710/local/snippets/system_files.custom | 4 ++-- coin/provisioning/common/windows/qnx710.ps1 | 6 +++--- 6 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/ifs_files.custom diff --git a/coin/provisioning/common/linux/qnx_710.sh b/coin/provisioning/common/linux/qnx_710.sh index 874e7b4a..0f527bef 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-20240417.tar.xz" +sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz" targetFile="qnx710.tar.xz" -sha1="cd2d35004fb2798089e29d9e1226691426632da0" +sha1="98b24df7e8c53a104aee76e769011396fa4bdafd" DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder" sudo cp "$aarch64le_toolchain" "$targetPath" diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/data_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/data_files.custom index cba74f1f..a3e14900 100644 --- a/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/data_files.custom +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/data_files.custom @@ -13,7 +13,7 @@ PATH=__IFS_PATH__:/system/xbin:. var/share/zoneinfo=usr/share/zoneinfo [uid=0 gid=0 dperms=755 type=dir] var/share/fonts -var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf +var/etc/fontconfig/fonts.conf=etc/fonts/fonts.conf var/share/fonts=usr/share/fonts var/etc/hosts=local/misc_files/etc/hosts diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/ifs_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/ifs_files.custom new file mode 100644 index 00000000..f3cf675e --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/ifs_files.custom @@ -0,0 +1,3 @@ +# local/snippets/ifs_files.custom +# Placeholder for local list of files to add to ifs +/usr/libexec/sshd-session=usr/libexec/sshd-session diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/post_start.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/post_start.custom index 5a260488..81ccaad6 100644 --- a/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/post_start.custom +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/post_start.custom @@ -18,6 +18,8 @@ rm -rf /data/var/share/fonts/NotoSansCJK* rm -rf /data/var/share/fonts/NotoSansMonoCJK* echo "---> Create fontconfig cache" fc-cache & +# For fc-match in QFont tests +ln -Ps /system/lib/libfontconfig.so.17 /system/lib/libfontconfig.so.1 # Add default route so QNX knows where to send # requests for unknown network diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/system_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/system_files.custom index 37cbd96d..06a63120 100644 --- a/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/system_files.custom +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/710/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.24=usr/lib/libfreetype.so.24 +lib/libfreetype.so.26=usr/lib/libfreetype.so.26 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 @@ -54,7 +54,7 @@ lib/libmmrndclient.so.1=usr/lib/libmmrndclient.so.1 lib/libscreen.so.1=usr/lib/libscreen.so.1 # for fontconfig -lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1 +lib/libfontconfig.so.17=usr/lib/libfontconfig.so.17 xbin/fc-cache=bin/fc-cache xbin/fc-match=local/misc_files/fc-match diff --git a/coin/provisioning/common/windows/qnx710.ps1 b/coin/provisioning/common/windows/qnx710.ps1 index c720619c..d80f91c8 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-20240417.tar.xz" -$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20240417.tar.xz" +$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx710-windows-linux-20260422.tar.xz" +$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz" $targetFile = "qnx710.tar.xz" -$sha1 = "cd2d35004fb2798089e29d9e1226691426632da0" +$sha1 = "98b24df7e8c53a104aee76e769011396fa4bdafd" DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl Copy-Item $aarch64le_toolchain $targetPath