summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2015-04-21 12:53:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-27 15:02:38 +0100
commit0dc2a530dfeadccd7b3baa2d8f5a478aa7ead1fb (patch)
tree82b632af4ecea421848a55324701499f32941774
parent6579836d8283d576bb451320ca9984b313eb2180 (diff)
downloadpoky-0dc2a530dfeadccd7b3baa2d8f5a478aa7ead1fb.zip
poky-0dc2a530dfeadccd7b3baa2d8f5a478aa7ead1fb.tar.gz
poky-0dc2a530dfeadccd7b3baa2d8f5a478aa7ead1fb.tar.bz2
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] (From OE-Core rev: 0ecccc7e75f2833c4f2599ce46b6fb9a0bc06e22) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/fontcache.bbclass2
-rw-r--r--scripts/postinst-intercepts/update_font_cache1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index dcd1f04..dfbdfa1 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 78f3365..3907f25 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