mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

libc locale split: fix some remaining problems

Browse Source 
* 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 <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Koen Kooi
2011-06-29 14:00:23 +02:00
committed by Richard Purdie
parent 8bdb4de37c
commit 6f0e589b29
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/libc-common.bbclass
+7
View File
@@ -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)
}
meta/classes/libc-package.bbclass
+1 -4
View File
@@ -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)
}