diff options
author | Jonathan Liu <net147@gmail.com> | 2015-03-09 13:28:37 +1100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-16 17:41:53 +0000 |
commit | d03e1677d54b6cc9668c7e50df53ad9e242d1629 (patch) | |
tree | 1a346a74adc0e6209a7cc9a8ab037fa948a2e949 | |
parent | a30c6a5225a97e8b3c1bef412668d2bd2e9713d8 (diff) | |
download | poky-d03e1677d54b6cc9668c7e50df53ad9e242d1629.tar.gz |
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: 23393c6685860d0b1c459874d35395360d0b6d3c)
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.bbclass | 2 | ||||
-rw-r--r-- | scripts/postinst-intercepts/update_font_cache | 1 |
2 files changed, 2 insertions, 1 deletions
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" | |||
12 | fontcache_common() { | 12 | fontcache_common() { |
13 | if [ "x$D" != "x" ] ; then | 13 | if [ "x$D" != "x" ] ; then |
14 | $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \ | 14 | $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \ |
15 | libdir=${libdir} base_libdir=${base_libdir} | 15 | libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir} |
16 | else | 16 | else |
17 | fc-cache | 17 | fc-cache |
18 | fi | 18 | 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 @@ | |||
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 | $D${bindir}/fc-cache --sysroot=$D |
5 | chown -R root:root $D${localstatedir}/cache/fontconfig | ||
5 | 6 | ||
6 | 7 | ||