diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-06-29 14:00:23 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-29 14:27:53 +0100 |
| commit | 477ede7472db0bacd5daacb96e97f849d1be84ee (patch) | |
| tree | d091751f302daebbec2688fd58cdaf67a1de17b1 /meta/classes/libc-package.bbclass | |
| parent | 2dccb370e04bc2bbe208b2b0541077d8ef519535 (diff) | |
| download | openembedded-core-477ede7472db0bacd5daacb96e97f849d1be84ee.tar.gz | |
libc locale split: fix some remaining problems
* libc-{common,package}.bbclass: fix shlib renaming for the C library
Without this you'd end up with eglibc_2.12.ipk instead of libc6_2.12.ipk as before
* eglibc-locale: don't make versions go backwards after split from eglibc
eglibc was way beyond PR = "r1" at the time of the split, so increase PR to make package upgrades work
[RP: Fixup PR merge conflict]
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/libc-package.bbclass')
| -rw-r--r-- | meta/classes/libc-package.bbclass | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index ff92afb179..7cfeb7de45 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -369,9 +369,6 @@ python package_do_split_gconvs () { # We want to do this indirection so that we can safely 'return' # from the called function even though we're prepending python populate_packages_prepend () { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bpn = bb.data.getVar('BPN', d, 1) - bb.data.setVar('PKG_'+bpn, 'libc6', d) - bb.data.setVar('PKG_'+bpn+'-dev', 'libc6-dev', d) bb.build.exec_func('package_do_split_gconvs', d) } + |