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 | |
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>
-rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb | 8 | ||||
-rw-r--r-- | scripts/postinst-intercepts/update_font_cache | 2 |
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 | ||
38 | do_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 | |||
38 | PACKAGES =+ "fontconfig-utils" | 44 | PACKAGES =+ "fontconfig-utils" |
39 | FILES_${PN} =+ "${datadir}/xml/*" | 45 | FILES_${PN} =+ "${datadir}/xml/*" |
40 | FILES_fontconfig-utils = "${bindir}/*" | 46 | FILES_fontconfig-utils = "${bindir}/* ${libexecdir}/*" |
41 | 47 | ||
42 | # Work around past breakage in debian.bbclass | 48 | # Work around past breakage in debian.bbclass |
43 | RPROVIDES_fontconfig-utils = "libfontconfig-utils" | 49 | RPROVIDES_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 | ||
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} |