From 754d240d2cf271bc7ada8351ad8cf205e44fac13 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Jul 2012 10:50:37 +0000 Subject: package.bbclass/eglibc-locale: Ensure the correct PN is used for locale packages (From OE-Core rev: fc4b138948656d482603b80f8c8e86fdbb185df4) Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 4 +++- meta/recipes-core/eglibc/eglibc-locale.inc | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index efb03f89bf..f55b3e0a65 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 699056953d..c08e38dee0 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" -- cgit v1.2.3-54-g00ecf