sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

fontcache: allow to pass different fontconfig cache dir 

(From OE-Core rev: 40f7986313277ef815b19331388bca124187bfeb)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2015-04-07 13:21:13 +02:00 committed by Richard Purdie
parent 71db5767a8
commit 29361a0e07
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/fontcache.bbclass
View File

@ -8,11 +8,11 @@ inherit qemu
FONT_PACKAGES ??= "${PN}"
FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
fontcache_common() {
if [ "x$D" != "x" ] ; then
$INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \
libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir}
libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
else
fc-cache
fi

4
meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
View File

@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
inherit autotools pkgconfig
EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}"
BBCLASSEXTEND = "native"

4
scripts/postinst-intercepts/update_font_cache
View File

@ -2,6 +2,4 @@
PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
$D${bindir}/fc-cache --sysroot=$D
chown -R root:root $D${localstatedir}/cache/fontconfig
chown -R root:root $D${fontconfigcachedir}