aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPasi Petäjäjärvi <pasi.petajajarvi@qt.io>2021-12-08 14:47:10 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-03 08:22:20 +0000
commit3a57e6e12edd6a2ac75fa2e069b049fa392bb2b2 (patch)
tree9c760730477c3dea7a86fc3ad2da78ae065cd368
parentd9cd912e88f36adcb34fe9ef3402a552c1359192 (diff)
CI: Add font support for QNX qemu
Task-number: QTBUG-99168 Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 848a7d5fa3da1fdc2d1760dc780cdb4499915749) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-xcoin/provisioning/common/linux/qnx_710.sh12
-rw-r--r--coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom4
-rw-r--r--coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom4
-rw-r--r--coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom6
-rw-r--r--coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom6
5 files changed, 31 insertions, 1 deletions
diff --git a/coin/provisioning/common/linux/qnx_710.sh b/coin/provisioning/common/linux/qnx_710.sh
index ea908b6d..b4d5e10e 100755
--- a/coin/provisioning/common/linux/qnx_710.sh
+++ b/coin/provisioning/common/linux/qnx_710.sh
@@ -83,6 +83,18 @@ sudo cp $aarch64le_toolchain $targetPath
sudo cp $armv7le_toolchain $targetPath
sudo cp $x8664_toolchain $targetPath
cp -R $QNX_qemu_bld_files_dir $qemuTargetPath
+# fc-match tool is missing from QNX SDP and tst_qfont requires it to work corretly
+# Download code-only package from https://www.iana.org/time-zones and follow README
+# to build tools for QNX x86_64. If need to build new tool create new qnx_qemu_utils
+# package which contains it and update required info below
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx_qemu_utils_20211208.tar.xz"
+targetFile="qnx_qemu_utils.tar.xz"
+targetFolder="$qemuTargetPath/local/misc_files"
+sha1="7653f5d50f61f1591d7785c3ec261228ecc9dd22"
+if [ ! -d "$targetFolder" ]; then
+ mkdir -p $targetFolder
+fi
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
sudo chown -R qt:users "$targetPath"
diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom
index c36fb391..de0da0bf 100644
--- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom
+++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom
@@ -11,3 +11,7 @@ PATH=__IFS_PATH__:/system/xbin
[uid=0 gid=0 dperms=755 type=dir] var/share
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/share/fonts=usr/share/fonts
diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom
index 5b15a26c..253e61c6 100644
--- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom
+++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom
@@ -6,3 +6,7 @@ HOME=/home/root
TZ=Europe/Oslo
procmgr_symlink /data/var/share /usr/share
procmgr_symlink /data/var/share/zoneinfo/Europe/Oslo /data/var/etc/localtime
+
+# fontconfig
+procmgr_symlink /data/var/etc/fontconfig/fonts.conf /etc/fontconfig/fonts.conf
+procmgr_symlink /data/var/share/fonts /usr/share/fonts
diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom
index 81899afb..f106ff41 100644
--- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom
+++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom
@@ -12,3 +12,9 @@
# resource manager supports a -U option for switching to non-root.
echo "---> Starting Filesystem event manager (fsevmgr)"
STARTU_P(fsevmg_t,__FSEVMG_ID__) fsevmgr -d -F __DEVB_ID__ -N __DEVB_ID__
+
+echo "---> Remove large fonts"
+rm -rf /data/var/share/fonts/NotoSansCJK*
+rm -rf /data/var/share/fonts/NotoSansMonoCJK*
+echo "---> Create fontconfig cache"
+fc-cache &
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 ad13398b..543c291e 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
@@ -19,7 +19,6 @@ lib/libicudata.so.67=usr/lib/libicudata.so.67
lib/libicui18n.so.67=usr/lib/libicui18n.so.67
lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1
lib/libEGL.so.1=usr/lib/libEGL.so.1
-lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
lib/libz.so.2=usr/lib/libz.so.2
lib/libxml2.so.2=usr/lib/libxml2.so.2
lib/libfreetype.so.1=usr/lib/libfreetype.so.1
@@ -44,3 +43,8 @@ lib/dll/img_codec_tif.so=lib/dll/img_codec_tif.so
# for inotify
xbin/fsevmgr=sbin/fsevmgr
+
+# for fontconfig
+lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
+xbin/fc-cache=bin/fc-cache
+xbin/fc-match=local/misc_files/fc-match