From 23393c6685860d0b1c459874d35395360d0b6d3c Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Mon, 9 Mar 2015 13:28:37 +1100 Subject: postinst-intercepts/update_font_cache: fix ownership of fontconfig cache The file ownership of the cache files in /var/cache/fontconfig needs to be set to root:root otherwise it inherits the user and group id of the build user. [YOCTO #7411] Signed-off-by: Jonathan Liu Signed-off-by: Ross Burton --- meta/classes/fontcache.bbclass | 2 +- scripts/postinst-intercepts/update_font_cache | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass index 2bf1e4bd1b..ad5892cda1 100644 --- a/meta/classes/fontcache.bbclass +++ b/meta/classes/fontcache.bbclass @@ -12,7 +12,7 @@ FONT_EXTRA_RDEPENDS ?= "fontconfig-utils" 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} + libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir} else fc-cache fi diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache index 78f33651e9..3907f25f19 100644 --- a/scripts/postinst-intercepts/update_font_cache +++ b/scripts/postinst-intercepts/update_font_cache @@ -2,5 +2,6 @@ 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 -- cgit 1.2.3-korg