diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-27 10:50:37 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-28 09:20:53 +0100 |
commit | 754d240d2cf271bc7ada8351ad8cf205e44fac13 (patch) | |
tree | e99a25115970053ccea62c30546e364fffe24bc9 /meta/classes | |
parent | 72ab2866e1727c373c3c651f98b1e5b5f3d47e8f (diff) | |
download | poky-754d240d2cf271bc7ada8351ad8cf205e44fac13.tar.gz |
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>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
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() { | |||
371 | d.setVar('PRAUTO',str(auto_pr)) | 371 | d.setVar('PRAUTO',str(auto_pr)) |
372 | } | 372 | } |
373 | 373 | ||
374 | LOCALEBASEPN ??= "${PN}" | ||
375 | |||
374 | python package_do_split_locales() { | 376 | python package_do_split_locales() { |
375 | if (d.getVar('PACKAGE_NO_LOCALE', True) == '1'): | 377 | if (d.getVar('PACKAGE_NO_LOCALE', True) == '1'): |
376 | bb.debug(1, "package requested not splitting locales") | 378 | bb.debug(1, "package requested not splitting locales") |
@@ -384,7 +386,7 @@ python package_do_split_locales() { | |||
384 | return | 386 | return |
385 | 387 | ||
386 | dvar = d.getVar('PKGD', True) | 388 | dvar = d.getVar('PKGD', True) |
387 | pn = d.getVar('PN', True) | 389 | pn = d.getVar('LOCALEBASEPN', True) |
388 | 390 | ||
389 | if pn + '-locale' in packages: | 391 | if pn + '-locale' in packages: |
390 | packages.remove(pn + '-locale') | 392 | packages.remove(pn + '-locale') |