summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb8
-rw-r--r--scripts/postinst-intercepts/update_font_cache2
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
index d4cbce80b4..cec524755d 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
@@ -35,9 +35,15 @@ do_configure_prepend() {
35 rm -f ${S}/src/fcobjshash.h ${S}/src/fcobjshash.gperf 35 rm -f ${S}/src/fcobjshash.h ${S}/src/fcobjshash.gperf
36} 36}
37 37
38do_install_append_class-target() {
39 # duplicate fc-cache for postinstall script
40 mkdir -p ${D}${libexecdir}
41 ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache
42}
43
38PACKAGES =+ "fontconfig-utils" 44PACKAGES =+ "fontconfig-utils"
39FILES_${PN} =+ "${datadir}/xml/*" 45FILES_${PN} =+ "${datadir}/xml/*"
40FILES_fontconfig-utils = "${bindir}/*" 46FILES_fontconfig-utils = "${bindir}/* ${libexecdir}/*"
41 47
42# Work around past breakage in debian.bbclass 48# Work around past breakage in debian.bbclass
43RPROVIDES_fontconfig-utils = "libfontconfig-utils" 49RPROVIDES_fontconfig-utils = "libfontconfig-utils"
diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
index 20e9048adf..e0ec471964 100644
--- a/scripts/postinst-intercepts/update_font_cache
+++ b/scripts/postinst-intercepts/update_font_cache
@@ -2,5 +2,5 @@
2 2
3set -e 3set -e
4 4
5PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D --system-only ${fontconfigcacheparams} 5PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E ${fontconfigcacheenv} $D${libexecdir}/${binprefix}fc-cache --sysroot=$D --system-only ${fontconfigcacheparams}
6chown -R root:root $D${fontconfigcachedir} 6chown -R root:root $D${fontconfigcachedir}