summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-08-26 17:29:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-30 22:27:58 +0100
commitb3922cad79e36a94f41c9839e4db0601f6dc4738 (patch)
tree0ece041b342b87fdafda43a57ba1781bdba1a840
parentde4f814bb04cfdfd8f5530aea87ad1319833782a (diff)
downloadpoky-b3922cad79e36a94f41c9839e4db0601f6dc4738.tar.gz
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>
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc20
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc20
2 files changed, 20 insertions, 20 deletions
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-* \
39 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ 39 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \
40 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" 40 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*"
41 41
42# Create a eglibc-binaries package
43ALLOW_EMPTY_${BPN}-binaries = "1"
44PACKAGES += "${BPN}-binaries"
45RRECOMMENDS_${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-binary") != -1])}"
46
47# Create a eglibc-charmaps package
48ALLOW_EMPTY_${BPN}-charmaps = "1"
49PACKAGES += "${BPN}-charmaps"
50RRECOMMENDS_${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-charmap") != -1])}"
51
52# Create a eglibc-gconvs package
53ALLOW_EMPTY_${BPN}-gconvs = "1"
54PACKAGES += "${BPN}-gconvs"
55RRECOMMENDS_${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-gconv") != -1])}"
56
57# Create a eglibc-localedatas package
58ALLOW_EMPTY_${BPN}-localedatas = "1"
59PACKAGES += "${BPN}-localedatas"
60RRECOMMENDS_${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-localedata") != -1])}"
61
42DESCRIPTION_localedef = "eglibc: compile locale definition files" 62DESCRIPTION_localedef = "eglibc: compile locale definition files"
43 63
44# eglibc-gconv is dynamically added into PACKAGES, thus 64# 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"
22 22
23PACKAGES = "${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}" 23PACKAGES = "${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}"
24 24
25# Create a eglibc-binaries
26ALLOW_EMPTY_${PN}-binaries = "1"
27PACKAGES += "${PN}-binaries"
28RRECOMMENDS_${PN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-binary") != -1])}"
29
30# Create a eglibc-charmaps package
31ALLOW_EMPTY_${PN}-charmaps = "1"
32PACKAGES += "${PN}-charmaps"
33RRECOMMENDS_${PN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-charmap") != -1])}"
34
35# Create a eglibc-gconvs package
36ALLOW_EMPTY_${PN}-gconvs = "1"
37PACKAGES += "${PN}-gconvs"
38RRECOMMENDS_${PN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-gconv") != -1])}"
39
40# Create a eglibc-localedatas package
41ALLOW_EMPTY_${PN}-localedatas = "1"
42PACKAGES += "${PN}-localedatas"
43RRECOMMENDS_${PN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-localedata") != -1])}"
44
45RPROVIDES_${PN} = "glibc${PKGSUFFIX}" 25RPROVIDES_${PN} = "glibc${PKGSUFFIX}"
46RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" 26RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils"
47RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" 27RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic"