summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 17:05:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 17:13:19 +0100
commiteb1c557d02d5781305d2bd7cc7c28b3c3e21e593 (patch)
tree1ddf6ce7111f82375b20b6a8362bef388c422850 /meta
parentf0c5451e5974d4810bb6c7baca90e87b1e2ee149 (diff)
downloadpoky-eb1c557d02d5781305d2bd7cc7c28b3c3e21e593.tar.gz
libc-locale: Drop PN-locale packages
These never seem to have been generated and matched no known FILES anyhow. This ensures localedef makes it into the correct package too. (From OE-Core rev: 8ee5160e8978d73ade2830c9f64df4c0009c0525) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc6
-rw-r--r--meta/recipes-core/glibc/glibc-locale_2.10.1.bb4
2 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index ed6c099c6c..7c4b1d501d 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,12 +26,12 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
26# set "0" for qemu emulation of native localedef for locale generation 26# set "0" for qemu emulation of native localedef for locale generation
27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" 27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
28 28
29PR = "r0" 29PR = "r1"
30 30
31PKGSUFFIX = "" 31PKGSUFFIX = ""
32PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 32PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
33 33
34PACKAGES = "eglibc-locale localedef${PKGSUFFIX}" 34PACKAGES = "localedef${PKGSUFFIX}"
35 35
36PACKAGES_DYNAMIC = "locale-base-* \ 36PACKAGES_DYNAMIC = "locale-base-* \
37 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ 37 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \
@@ -39,8 +39,6 @@ PACKAGES_DYNAMIC = "locale-base-* \
39 39
40PROVIDES = "virtual/libc-locale${PKGSUFFIX}" 40PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
41 41
42RPROVIDES_eglibc-locale = "glibc-locale"
43
44FILES_eglibc-gconv = "${libdir}/gconv/*" 42FILES_eglibc-gconv = "${libdir}/gconv/*"
45FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" 43FILES_localedef${PKGSUFFIX} = "${bindir}/localedef"
46 44
diff --git a/meta/recipes-core/glibc/glibc-locale_2.10.1.bb b/meta/recipes-core/glibc/glibc-locale_2.10.1.bb
index d8ff12d274..60825397a5 100644
--- a/meta/recipes-core/glibc/glibc-locale_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc-locale_2.10.1.bb
@@ -26,14 +26,14 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
26# set "0" for qemu emulation of native localedef for locale generation 26# set "0" for qemu emulation of native localedef for locale generation
27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" 27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
28 28
29PR = "r0" 29PR = "r1"
30 30
31PKGSUFFIX = "" 31PKGSUFFIX = ""
32PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 32PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
33 33
34PROVIDES = "virtual/libc-locale" 34PROVIDES = "virtual/libc-locale"
35 35
36PACKAGES = "glibc-locale localedef${PKGSUFFIX}" 36PACKAGES = "localedef${PKGSUFFIX}"
37 37
38PACKAGES_DYNAMIC = "locale-base-* \ 38PACKAGES_DYNAMIC = "locale-base-* \
39 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" 39 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*"