summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-06-29 14:00:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-29 14:27:53 +0100
commit477ede7472db0bacd5daacb96e97f849d1be84ee (patch)
treed091751f302daebbec2688fd58cdaf67a1de17b1
parent2dccb370e04bc2bbe208b2b0541077d8ef519535 (diff)
downloadopenembedded-core-477ede7472db0bacd5daacb96e97f849d1be84ee.tar.gz
openembedded-core-477ede7472db0bacd5daacb96e97f849d1be84ee.tar.bz2
openembedded-core-477ede7472db0bacd5daacb96e97f849d1be84ee.zip
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>
-rw-r--r--meta/classes/libc-common.bbclass7
-rw-r--r--meta/classes/libc-package.bbclass5
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc18
4 files changed, 14 insertions, 18 deletions
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index bae0ace890..5e932051a2 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 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)
}
+
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index c84f03292b..00cccc0175 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 = "r2"
+PR = "r16"
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 831835612e..8228484815 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -90,21 +90,13 @@ inherit libc-common
do_install_locale () {
dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
- install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir}
- cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
- cp -fpP ${D}${bindir}/localedef ${dest}${bindir}
- mv ${D}${libdir}/gconv ${dest}${libdir}
- cp -fpPR ${D}${libdir}/* ${dest}${libdir}
- mv ${D}${datadir}/i18n ${dest}${datadir}
- cp -fpPR ${D}${datadir}/* ${dest}${datadir}
+ install -d ${dest} ${dest}${bindir}
+ cp -fpPR ${D}${base_libdir} ${dest}${base_prefix}
+ cp -fpPR ${D}${libdir} ${dest}${exec_prefix}
+ cp -fpPR ${D}${datadir} ${dest}${exec_prefix}
+ cp -fpPR ${D}${bindir}/localedef ${dest}${bindir}
cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
}
addtask do_install_locale after do_install before do_populate_sysroot
-PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
-
-eglibc_package_preprocess () {
- rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
-}
-