Patchwork [v2] libc-{common, package}.bbclass: fix shlib renaming for the C library

login
register
mail settings
Submitter Koen Kooi
Date June 28, 2011, 8:22 p.m.
Message ID <1309292522-11936-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/6623/
State New, archived
Headers show

Comments

Koen Kooi - June 28, 2011, 8:22 p.m.
Without this you'd end up with eglibc_2.12.ipk instead of libc6_2.12.ipk as before

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/classes/libc-common.bbclass  |    8 ++++++++
 meta/classes/libc-package.bbclass |    7 +------
 2 files changed, 9 insertions(+), 6 deletions(-)

Patch

diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index bae0ace..a9ec5f1 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -21,3 +21,11 @@  def get_libc_fpu_setting(bb, d):
     if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
         return "--without-fp"
     return ""
+# 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)
+}
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 4bc58c8..8e03f03 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -365,12 +365,7 @@  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)
 }
+