diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-09-11 19:25:19 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-13 07:42:28 +0100 |
commit | 44fa30ffa23c9816f4eade57b4002f0c9fa89735 (patch) | |
tree | 3c085421e0e2069e169744a2ae8331ac002822e8 /scripts | |
parent | d14fb257881ab9b87fa53c68af5b09a755cb162f (diff) | |
download | poky-44fa30ffa23c9816f4eade57b4002f0c9fa89735.tar.gz |
update_font_cache: update script for multilib
Packages which inherit fontcache.bbclass call postinstall script
update_font_cache. And in update_font_cache, it calls ${bindir}/fc-cache
by qemuwrapper. When multilib is enabled, both packages foo and lib32-foo
will call ${bindir}/fc-cache and one of them will fail to run obviously.
Duplicate install file fc-cache to ${libexecdir} with ${MLPREFIX} and
call proper fc-cache in update_font_cache.
(From OE-Core rev: 53d8625732b0c8416e367d5eef43863ec2065433)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/postinst-intercepts/update_font_cache | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||
3 | set -e | 3 | set -e |
4 | 4 | ||
5 | PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D --system-only ${fontconfigcacheparams} | 5 | PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E ${fontconfigcacheenv} $D${libexecdir}/${binprefix}fc-cache --sysroot=$D --system-only ${fontconfigcacheparams} |
6 | chown -R root:root $D${fontconfigcachedir} | 6 | chown -R root:root $D${fontconfigcachedir} |