diff options
| -rw-r--r-- | meta/classes/package.bbclass | 4 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale.inc | 1 |
2 files changed, 4 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') |
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" | |||
| 2 | LICENSE = "GPLv2 & LGPLv2.1" | 2 | LICENSE = "GPLv2 & LGPLv2.1" |
| 3 | 3 | ||
| 4 | BPN = "eglibc" | 4 | BPN = "eglibc" |
| 5 | LOCALEBASEPN = "eglibc" | ||
| 5 | 6 | ||
| 6 | do_fetch[noexec] = "1" | 7 | do_fetch[noexec] = "1" |
| 7 | do_unpack[noexec] = "1" | 8 | do_unpack[noexec] = "1" |
