[OE-core] [PATCH 3/5] update_font_cache: update script for multilib
Kang Kai
Kai.Kang at windriver.com
Thu Sep 6 15:27:27 UTC 2018
On 2018年09月04日 18:02, Kang Kai wrote:
> On 2018年09月04日 17:44, Martin Jansa wrote:
>> Hi Kai,
>>
>> do you have similar fix for update_gio_module_cache intercept? It
>> seems to fail similarly with multilib enabled.
>
> The fix is from script update_gio_module_cache, so I thought it works
> and didn't meet the failure. I'll check it.
Hi Martin,
It has been done by
http://git.openembedded.org/openembedded-core/commit/?id=1f53140528d79c38d4f3a82cd0a03bd0ddc87275
Add lib23-gconf to image which inherits gio-module-cache, then build
image successfully.
Regards,
Kai
>
> Thanks,
> Kai
>
>>
>> Regards,
>>
>> On Sat, Aug 25, 2018 at 7:14 PM Kai Kang <kai.kang at windriver.com
>> <mailto:kai.kang at windriver.com>> wrote:
>>
>> 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.
>>
>> Signed-off-by: Kai Kang <kai.kang at windriver.com
>> <mailto:kai.kang at windriver.com>>
>> ---
>> meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
>> <http://fontconfig_2.12.6.bb> | 8 +++++++-
>> 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
>> <http://fontconfig_2.12.6.bb>
>> b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
>> <http://fontconfig_2.12.6.bb>
>> index d4cbce80b45..db36c867741 100644
>> --- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
>> <http://fontconfig_2.12.6.bb>
>> +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
>> <http://fontconfig_2.12.6.bb>
>> @@ -35,9 +35,15 @@ do_configure_prepend() {
>> rm -f ${S}/src/fcobjshash.h ${S}/src/fcobjshash.gperf
>> }
>>
>> +do_install_append_class-target() {
>> + # duplicate fc-cache for postinstall script
>> + mkdir -p ${D}${libexecdir}
>> + cp ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache
>> +}
>> +
>> PACKAGES =+ "fontconfig-utils"
>> FILES_${PN} =+ "${datadir}/xml/*"
>> -FILES_fontconfig-utils = "${bindir}/*"
>> +FILES_fontconfig-utils = "${bindir}/* ${libexecdir}/*"
>>
>> # Work around past breakage in debian.bbclass
>> RPROVIDES_fontconfig-utils = "libfontconfig-utils"
>> diff --git a/scripts/postinst-intercepts/update_font_cache
>> b/scripts/postinst-intercepts/update_font_cache
>> index 20e9048adfc..e0ec471964c 100644
>> --- a/scripts/postinst-intercepts/update_font_cache
>> +++ b/scripts/postinst-intercepts/update_font_cache
>> @@ -2,5 +2,5 @@
>>
>> set -e
>>
>> -PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E
>> ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D
>> --system-only ${fontconfigcacheparams}
>> +PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E
>> ${fontconfigcacheenv} $D${libexecdir}/${binprefix}fc-cache
>> --sysroot=$D --system-only ${fontconfigcacheparams}
>> chown -R root:root $D${fontconfigcachedir}
>> --
>> 2.11.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> <mailto:Openembedded-core at lists.openembedded.org>
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
> --
> Regards,
> Neil | Kai Kang
--
Regards,
Neil | Kai Kang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180906/525f88dd/attachment-0002.html>
More information about the Openembedded-core
mailing list