]> code.ossystems Code Review - openembedded-core.git/commitdiff
update_font_cache: only scan system font directories
authorRoss Burton <ross.burton@intel.com>
Fri, 8 Jan 2016 20:44:15 +0000 (20:44 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Jan 2016 23:23:18 +0000 (23:23 +0000)
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/postinst-intercepts/update_font_cache

index 0deab3c115850473a50509bb2bf7cf1c26872ae5..2e6daedeb5d8e4e51d1a439de30858c7c044b71d 100644 (file)
@@ -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}