package.bbclass/eglibc-locale: Ensure the correct PN is used for locale packages

(From OE-Core rev: fc4b138948656d482603b80f8c8e86fdbb185df4)

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

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index efb03f89bf656203f84eb6c8038c4c1cea90426f..f55b3e0a658a968dd348750440fe6561c4a8756b 100644 (file)
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -371,6 +371,8 @@ python package_get_auto_pr() {
         d.setVar('PRAUTO',str(auto_pr))
 }
 
+LOCALEBASEPN ??= "${PN}"
+
 python package_do_split_locales() {
     if (d.getVar('PACKAGE_NO_LOCALE', True) == '1'):
         bb.debug(1, "package requested not splitting locales")
@@ -384,7 +386,7 @@ python package_do_split_locales() {
         return
 
     dvar = d.getVar('PKGD', True)
-    pn = d.getVar('PN', True)
+    pn = d.getVar('LOCALEBASEPN', True)
 
     if pn + '-locale' in packages:
         packages.remove(pn + '-locale')

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 699056953dd270648641dbf75d309f4b3010133b..c08e38dee01a1e02b9835157abf4d9a75526c09c 100644 (file)
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -2,6 +2,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 LICENSE = "GPLv2 & LGPLv2.1"
 
 BPN = "eglibc"
+LOCALEBASEPN = "eglibc"
 
 do_fetch[noexec] = "1"
 do_unpack[noexec] = "1"