summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-01-08 20:44:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-11 23:26:32 +0000
commit34f8db9b44fb65e0770886276377cba55af8756c (patch)
tree12e2b8917cbbef6113eb1933a0985ba15b13429b
parente5c011b041dc27cdfeb840b6933dcb9752886bb9 (diff)
downloadopenembedded-core-contrib-34f8db9b44fb65e0770886276377cba55af8756c.tar.gz
openembedded-core-contrib-34f8db9b44fb65e0770886276377cba55af8756c.tar.bz2
openembedded-core-contrib-34f8db9b44fb65e0770886276377cba55af8756c.zip
update_font_cache: only scan system font directories
By default fc-cache will scan both system and user directories, which means it attempts to scan $HOME/.fonts. As this is the build host's idea of $HOME this generally doesn't exist, and causes fc-cache to exit with a failure. Solve this by passing --system-only so that fc-cache will only scan system directories, as is appropriate for a rootfs-time invocation. (From OE-Core rev: 541315d6c56df6448f64c262f99d43d5c1e9400b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/postinst-intercepts/update_font_cache2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
index 0deab3c115..2e6daedeb5 100644
--- a/scripts/postinst-intercepts/update_font_cache
+++ b/scripts/postinst-intercepts/update_font_cache
@@ -1,5 +1,5 @@
#!/bin/sh
PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir} \
- -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D ${fontconfigcacheparams}
+ -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D --system-only ${fontconfigcacheparams}
chown -R root:root $D${fontconfigcachedir}