mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-27 03:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

eglibc: fix packaging of some of nativesdk packages

Browse Source 
eglibc.inc contains packaging rules that depend on PKGSUFFIX expansion.
However that variable wasn't expanded properly in some case. E.g.

PACKAGES = " ... nscd${PKGSUFFIX} ..."
FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"

would be expanded to

PACKAGES = " ... nscd-nativesdk ..."
FILES_nscd = "${sbindir}/nscd*"

Thus leading to empty -nativesdk packages and missing files. To overcome
that use python code blob to properly define PKGSUFFIX variable.

(From OE-Core rev: 974cdb88680359aac5aefd11b84c4a374ab3a753)

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dmitry Eremin-Solenikov
2011-09-21 22:39:58 +04:00
committed by Richard Purdie
parent cac6eb9c11
commit f800862555
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meta/recipes-core/eglibc/eglibc-locale.inc
View File

@@ -26,10 +26,15 @@ 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 = "r16"
PR = "r17"
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
python __anonymous () {
import bb
if bb.data.inherits_class("nativesdk", d):
bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
else:
bb.data.setVar("PKGSUFFIX", "", d)
}
PROVIDES = "virtual/libc-locale${PKGSUFFIX}"

9
meta/recipes-core/eglibc/eglibc-package.inc
View File

@@ -17,8 +17,13 @@ python __anonymous () {
# Set this to zero if you don't want ldconfig in the output package
USE_LDCONFIG ?= "1"
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
python __anonymous () {
import bb
if bb.data.inherits_class("nativesdk", d):
bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
else:
bb.data.setVar("PKGSUFFIX", "", d)
}
PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}"

2
meta/recipes-core/eglibc/eglibc_2.12.bb
View File

@@ -1,7 +1,7 @@
require eglibc.inc
DEPENDS += "gperf-native"
PR = "r24"
PR = "r25"
SRCREV = "14158"

2
meta/recipes-core/eglibc/eglibc_2.13.bb
View File

@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "14157"
DEPENDS += "gperf-native"
PR = "r15"
PR = "r16"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"