From 40dfcecd4a02b464a4538d764c4b4c901cecefb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Wed, 8 Dec 2021 14:47:10 +0200 Subject: CI: Add font support for QNX qemu Task-number: QTBUG-99168 Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5 Reviewed-by: Samuli Piippo (cherry picked from commit 848a7d5fa3da1fdc2d1760dc780cdb4499915749) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/qnx_710.sh | 12 ++++++++++++ .../qnx_qemu_build_files/local/snippets/data_files.custom | 4 ++++ .../linux/qnx_qemu_build_files/local/snippets/ifs_env.custom | 4 ++++ .../qnx_qemu_build_files/local/snippets/post_start.custom | 6 ++++++ .../qnx_qemu_build_files/local/snippets/system_files.custom | 6 +++++- 5 files changed, 31 insertions(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/qnx_710.sh b/coin/provisioning/common/linux/qnx_710.sh index ccce51f0..d2878233 100755 --- a/coin/provisioning/common/linux/qnx_710.sh +++ b/coin/provisioning/common/linux/qnx_710.sh @@ -89,6 +89,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 0b085e3c..fa2dcce1 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.23=usr/lib/libfreetype.so.23 @@ -45,3 +44,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 -- cgit v1.2.3