diff options
Diffstat (limited to 'meta/classes/fontcache.bbclass')
| -rw-r--r-- | meta/classes/fontcache.bbclass | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass index d3c1562f24..8ebdfc4f5c 100644 --- a/meta/classes/fontcache.bbclass +++ b/meta/classes/fontcache.bbclass @@ -7,25 +7,38 @@ DEPENDS += "qemu-native" inherit qemu FONT_PACKAGES ??= "${PN}" - -# -# On host, the postinstall MUST return 1 because we do not know if the intercept -# hook will succeed. If it does succeed, than the packages will be marked as -# installed. -# +FONT_EXTRA_RDEPENDS ?= "fontconfig-utils" +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" +FONTCONFIG_CACHE_PARAMS ?= "-v" +# You can change this to e.g. FC_DEBUG=16 to debug fc-cache issues, +# something has to be set, because qemuwrapper is using this variable after -E +# multiple variables aren't allowed because for qemu they are separated +# by comma and in -n "$D" case they should be separated by space +FONTCONFIG_CACHE_ENV ?= "FC_DEBUG=1" fontcache_common() { -if [ "x$D" != "x" ] ; then - $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} - exit 1 +if [ -n "$D" ] ; then + $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} \ + 'bindir="${bindir}"' \ + 'libdir="${libdir}"' \ + 'base_libdir="${base_libdir}"' \ + 'fontconfigcachedir="${FONTCONFIG_CACHE_DIR}"' \ + 'fontconfigcacheparams="${FONTCONFIG_CACHE_PARAMS}"' \ + 'fontconfigcacheenv="${FONTCONFIG_CACHE_ENV}"' +else + ${FONTCONFIG_CACHE_ENV} fc-cache ${FONTCONFIG_CACHE_PARAMS} fi - -fc-cache } -python populate_packages_append() { +python () { font_pkgs = d.getVar('FONT_PACKAGES', True).split() + deps = d.getVar("FONT_EXTRA_RDEPENDS", True) for pkg in font_pkgs: + if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps) +} + +python add_fontcache_postinsts() { + for pkg in d.getVar('FONT_PACKAGES', True).split(): bb.note("adding fonts postinst and postrm scripts to %s" % pkg) postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) if not postinst: @@ -39,3 +52,5 @@ python populate_packages_append() { postrm += d.getVar('fontcache_common', True) d.setVar('pkg_postrm_%s' % pkg, postrm) } + +PACKAGEFUNCS =+ "add_fontcache_postinsts" |