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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index ed6c099c6c4a628455ecce99f78442dbd6755139..7c4b1d501da6f1e4a748d18cf70fde37f5322360 100644 (file)
--- 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"
 # set "0" for qemu emulation of native localedef for locale generation
 LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
 
-PR = "r0"
+PR = "r1"
 
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
-PACKAGES = "eglibc-locale localedef${PKGSUFFIX}"
+PACKAGES = "localedef${PKGSUFFIX}"
 
 PACKAGES_DYNAMIC = "locale-base-* \
                     eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \
@@ -39,8 +39,6 @@ PACKAGES_DYNAMIC = "locale-base-* \
 
 PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
 
-RPROVIDES_eglibc-locale = "glibc-locale"
-
 FILES_eglibc-gconv = "${libdir}/gconv/*"
 FILES_localedef${PKGSUFFIX} = "${bindir}/localedef"
 

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 d8ff12d274c37f8579b128c77753fd01b2923c32..60825397a5afcfe371fda069be1cd0c0a28170e9 100644 (file)
--- 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"
 # set "0" for qemu emulation of native localedef for locale generation
 LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
 
-PR = "r0"
+PR = "r1"
 
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
 PROVIDES = "virtual/libc-locale"
 
-PACKAGES = "glibc-locale localedef${PKGSUFFIX}"
+PACKAGES = "localedef${PKGSUFFIX}"
 
 PACKAGES_DYNAMIC = "locale-base-* \
                     glibc-gconv-*${PKGSUFFIX}  glibc-charmap-*  glibc-localedata-*  glibc-binary-localedata-*"