[oe-commits] Dongxiao Xu : eglibc-locale: Specially handle FILES_eglibc-gconv for multilib
git version control
git at git.openembedded.org
Wed Aug 3 17:08:18 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 4a5cc82218fa730b898c553875accfeb6800f9a4
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4a5cc82218fa730b898c553875accfeb6800f9a4
Author: Dongxiao Xu <dongxiao.xu at intel.com>
Date: Wed Aug 3 23:19:33 2011 +0800
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.
Signed-off-by: Dongxiao Xu <dongxiao.xu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/libc-package.bbclass | 2 +-
meta/recipes-core/eglibc/eglibc-locale.inc | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index de57230..0d5ce20 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -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)
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index b496ce6..ca3940d 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -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"
More information about the Openembedded-commits
mailing list