[OE-core] [PATCH v2] libc locale split: fix some remaining problems

[Koen Kooi]

* 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

This still doesn't fix:

$ dpkg-deb -I ipk/armv7a/libc6_2.12-r16_armv7a.ipk
 Package: libc6
	[..]
 Depends: libc6-dev (>= 2.12)

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
 meta/classes/libc-common.bbclass           |    7 +++++++
 meta/classes/libc-package.bbclass          |    5 +----
 meta/recipes-core/eglibc/eglibc-locale.inc |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index bae0ace..5e93205 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -21,3 +21,10 @@ def get_libc_fpu_setting(bb, d):
     if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
         return "--without-fp"
     return ""
+
+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)
+}
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 4bc58c8..695b260 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -368,9 +368,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)
 }
+
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 7c4b1d5..96f2d8a 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
 # set "0" for qemu emulation of native localedef for locale generation
 LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
 
-PR = "r1"
+PR = "r16"
 
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
-- 
1.6.6.1