diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
| commit | ebf8aa15e67caacab514ea93782ff0783d60af2d (patch) | |
| tree | ecbaf2c3669d1de878ead56e8b44a83bff65efdc /coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64 | |
| parent | d18d7aaa40cfd92279bec558e980ff6c58c49340 (diff) | |
| parent | dfaabde5dcbdecf24d24dce4172c976687085bb6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
coin/provisioning/common/system_updates.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh index 9c906562..20fb83ad 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh @@ -66,13 +66,23 @@ sudo update-binfmts --package qemu-arm --install arm \ sudo DEBIAN_FRONTEND=noninteractive apt-get -y remove fonts-noto-cjk # If normal fontconfig paths are used, qemu parses what ever files it finds from -# the toolchain sysroot and the rest from the system fonts. Fix by copying the -# system font configurations to a location which prefix that can't be found from -# the toolchain sysroot. Links must also be dereferenced or their targets remain -# pointing to the toolchain sysroot. +# the toolchain sysroot and the rest from the system fonts. QEMU_FONTCONFPATH=~/qemu_fonts QEMU_FONTCONFFILE=$QEMU_FONTCONFPATH/fonts.qemu.conf mkdir -p $QEMU_FONTCONFPATH + +# Copy system font configuration files from system to a location with prefix that can't be found from +# the toolchain sysroot cp -Lr /etc/fonts/* $QEMU_FONTCONFPATH + +# Create links to the actual system font files +ln -s /usr/share/fonts $QEMU_FONTCONFPATH/fonts +ln -s /usr/local/share/fonts $QEMU_FONTCONFPATH/local_fonts + +# Change font configuration file to point to files that can't be found from the toolchain sysroot sed $QEMU_FONTCONFPATH/fonts.conf -e "s:conf.d:$QEMU_FONTCONFPATH/conf.d:" > $QEMU_FONTCONFFILE +sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i +sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i + +# Set QEMU font configuration variables echo "export QEMU_SET_ENV=\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" >> ~/.profile |