diff options
-rw-r--r-- | meta/classes/fontcache.bbclass | 19 | ||||
-rw-r--r-- | scripts/postinst-intercepts/update_font_cache | 4 |
2 files changed, 17 insertions, 6 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass index d122387ffd..8ebdfc4f5c 100644 --- a/meta/classes/fontcache.bbclass +++ b/meta/classes/fontcache.bbclass | |||
@@ -9,12 +9,23 @@ inherit qemu | |||
9 | FONT_PACKAGES ??= "${PN}" | 9 | FONT_PACKAGES ??= "${PN}" |
10 | FONT_EXTRA_RDEPENDS ?= "fontconfig-utils" | 10 | FONT_EXTRA_RDEPENDS ?= "fontconfig-utils" |
11 | FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" | 11 | FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" |
12 | FONTCONFIG_CACHE_PARAMS ?= "-v" | ||
13 | # You can change this to e.g. FC_DEBUG=16 to debug fc-cache issues, | ||
14 | # something has to be set, because qemuwrapper is using this variable after -E | ||
15 | # multiple variables aren't allowed because for qemu they are separated | ||
16 | # by comma and in -n "$D" case they should be separated by space | ||
17 | FONTCONFIG_CACHE_ENV ?= "FC_DEBUG=1" | ||
12 | fontcache_common() { | 18 | fontcache_common() { |
13 | if [ "x$D" != "x" ] ; then | 19 | if [ -n "$D" ] ; then |
14 | $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \ | 20 | $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} \ |
15 | libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR} | 21 | 'bindir="${bindir}"' \ |
22 | 'libdir="${libdir}"' \ | ||
23 | 'base_libdir="${base_libdir}"' \ | ||
24 | 'fontconfigcachedir="${FONTCONFIG_CACHE_DIR}"' \ | ||
25 | 'fontconfigcacheparams="${FONTCONFIG_CACHE_PARAMS}"' \ | ||
26 | 'fontconfigcacheenv="${FONTCONFIG_CACHE_ENV}"' | ||
16 | else | 27 | else |
17 | fc-cache | 28 | ${FONTCONFIG_CACHE_ENV} fc-cache ${FONTCONFIG_CACHE_PARAMS} |
18 | fi | 29 | fi |
19 | } | 30 | } |
20 | 31 | ||
diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache index c8c6018f27..0deab3c115 100644 --- a/scripts/postinst-intercepts/update_font_cache +++ b/scripts/postinst-intercepts/update_font_cache | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ | 3 | PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir} \ |
4 | $D${bindir}/fc-cache --sysroot=$D | 4 | -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D ${fontconfigcacheparams} |
5 | chown -R root:root $D${fontconfigcachedir} | 5 | chown -R root:root $D${fontconfigcachedir} |