sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

eglibc-locale: Specially handle FILES_eglibc-gconv for multilib 

In multilib support, it iterate values in PACKAGES and then extend name
for variables like "FILES_xxx", "SUMMARY_xxx", etc.

However eglibc-gconv is dynamically put in PACKAGES by
package_do_split_gconv function. Therefore the name will not be
extended automatically.

Specially handle the FILES variable for eglibc-gconv to fix the issue
of missing "lib32-eglibc-gconv" issue in doing multilib do_rootfs.

Also when set PACKAGES, add the MLPREFIX.

(From OE-Core rev: 4a5cc82218fa730b898c553875accfeb6800f9a4)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu 2011-08-03 23:19:33 +08:00 committed by Richard Purdie
parent 889455c98e
commit 37fb8cd049
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/libc-package.bbclass
View File

@ -191,7 +191,7 @@ python package_do_split_gconvs () {
do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern=bpn+'-localedata-%s', \
description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' ' + bpn + '-gconv', d)
bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' ' + bb.data.getVar('MLPREFIX', d) + bpn + '-gconv', d)
use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)

5
meta/recipes-core/eglibc/eglibc-locale.inc
View File

@ -41,7 +41,10 @@ PACKAGES_DYNAMIC = "locale-base-* \
DESCRIPTION_localedef = "eglibc: compile locale definition files"
FILES_eglibc-gconv = "${libdir}/gconv/*"
# eglibc-gconv is dynamically added into PACKAGES, thus
# FILES_eglibc-gconv will not be automatically extended in multilib.
# Explicitly add ${MLPREFIX} for FILES_eglibc-gconv.
FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*"
FILES_${PN}-dbg += "${libdir}/gconv/.debug/*"
FILES_localedef${PKGSUFFIX} = "${bindir}/localedef"