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

login
register
mail settings
Submitter Richard Purdie
Date July 27, 2012, 11:36 a.m.
Message ID <1343389016.9574.122.camel@ted>
Download mbox | patch
Permalink /patch/33205/
State Accepted
Commit fc4b138948656d482603b80f8c8e86fdbb185df4
Headers show

Comments

Richard Purdie - July 27, 2012, 11:36 a.m.
This avoids dependencies like eglibc-locale-locale creeping into 
the eglibc locale packaging by blinding using the value of PN.

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

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index ea199d3..90f145d 100644
--- 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 6990569..c08e38d 100644
--- 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"