From e0ea56a6b33662dbbe542c77cde2524c1d1ec197 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 3 Aug 2011 23:19:33 +0800 Subject: 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 Signed-off-by: Richard Purdie --- 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 de572302d4..0d5ce20fe5 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 b496ce696c..ca3940dc52 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" -- cgit v1.2.3-54-g00ecf