From b3922cad79e36a94f41c9839e4db0601f6dc4738 Mon Sep 17 00:00:00 2001
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Date: Fri, 26 Aug 2011 17:29:44 +0800
Subject: eglibc-locale.inc: Add eglibc-binaries, eglibc-localedatas,
 eglibc-gconvs and eglibc-charmps to variable PACKAGE

There are no locales resources in an lsb image because the locale resources were splitted from eglibc-package.inc \
and putted into a new file "eglibc-locale.inc". So the above variables lost their function in eglibc-package.inc and
caused no locale resources in an lsb image. The purpose of moving the above variables from eglibc-package.inc to \
eglibc-locale.inc is to make the above variables to take effect.

eglibc-binaries include packages "eglibc-binary-*"
eglibc-localedatas include packages "eglibc-localedata-*"
eglibc-gconvs include packages "eglibc-gconv-*"
eglibc-charmaps include packages "eglibc-charmap-*"

(From OE-Core rev: 0903a2c62a58f94b7d424162e8c852b502d3840a)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/eglibc/eglibc-locale.inc  | 20 ++++++++++++++++++++
 meta/recipes-core/eglibc/eglibc-package.inc | 20 --------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'meta/recipes-core/eglibc')

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index b8107eea90..9424ff577a 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -39,6 +39,26 @@ PACKAGES_DYNAMIC = "locale-base-* \
                     eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \
                     glibc-gconv-*${PKGSUFFIX}  glibc-charmap-*  glibc-localedata-*  glibc-binary-localedata-*"
 
+# Create a eglibc-binaries package
+ALLOW_EMPTY_${BPN}-binaries = "1"
+PACKAGES += "${BPN}-binaries"
+RRECOMMENDS_${BPN}-binaries =  "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-binary") != -1])}"
+
+# Create a eglibc-charmaps package
+ALLOW_EMPTY_${BPN}-charmaps = "1"
+PACKAGES += "${BPN}-charmaps"
+RRECOMMENDS_${BPN}-charmaps =  "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-charmap") != -1])}"
+
+# Create a eglibc-gconvs package
+ALLOW_EMPTY_${BPN}-gconvs = "1"
+PACKAGES += "${BPN}-gconvs"
+RRECOMMENDS_${BPN}-gconvs =  "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-gconv") != -1])}"
+
+# Create a eglibc-localedatas package
+ALLOW_EMPTY_${BPN}-localedatas = "1"
+PACKAGES += "${BPN}-localedatas"
+RRECOMMENDS_${BPN}-localedatas =  "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-localedata") != -1])}"
+
 DESCRIPTION_localedef = "eglibc: compile locale definition files"
 
 # eglibc-gconv is dynamically added into PACKAGES, thus
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index adda5e9804..469e02de57 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -22,26 +22,6 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
 PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}"
 
-# Create a eglibc-binaries
-ALLOW_EMPTY_${PN}-binaries = "1"
-PACKAGES += "${PN}-binaries"
-RRECOMMENDS_${PN}-binaries =  "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-binary") != -1])}"
-
-# Create a eglibc-charmaps package 
-ALLOW_EMPTY_${PN}-charmaps = "1"
-PACKAGES += "${PN}-charmaps"
-RRECOMMENDS_${PN}-charmaps =  "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-charmap") != -1])}"
-
-# Create a eglibc-gconvs package 
-ALLOW_EMPTY_${PN}-gconvs = "1"
-PACKAGES += "${PN}-gconvs"
-RRECOMMENDS_${PN}-gconvs =  "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-gconv") != -1])}"
-
-# Create a eglibc-localedatas package 
-ALLOW_EMPTY_${PN}-localedatas = "1"
-PACKAGES += "${PN}-localedatas"
-RRECOMMENDS_${PN}-localedatas =  "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-localedata") != -1])}"
-
 RPROVIDES_${PN} = "glibc${PKGSUFFIX}"
 RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils"
 RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic"
-- 
cgit v1.2.3-54-g00ecf