From 6f0e589b29b1b02e71b4af0011c5b0d06a5bfc57 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 29 Jun 2011 14:00:23 +0200 Subject: 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] (From OE-Core rev: 477ede7472db0bacd5daacb96e97f849d1be84ee) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- meta/classes/libc-package.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/classes/libc-package.bbclass') 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) } + -- cgit v1.2.3-54-g00ecf