Revert "eglibc: fix packaging of some of nativesdk packages"

This reverts commit 974cdb88680359aac5aefd11b84c4a374ab3a753.

See the mailing list for details, this broke things for too
many people such as where PKGSUFFIX is used in PREFERRED_PROVIDER.

odified:   meta/recipes-core/eglibc/eglibc-locale.inc

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-09-22 20:50:35 +01:00
parent f4b4432b74
commit 2a7870778f
4 changed files with 7 additions and 17 deletions

View File

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

View File

@@ -17,13 +17,8 @@ python __anonymous () {
# Set this to zero if you don't want ldconfig in the output package
USE_LDCONFIG ?= "1"
python __anonymous () {
import bb
if bb.data.inherits_class("nativesdk", d):
bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
else:
bb.data.setVar("PKGSUFFIX", "", d)
}
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
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}"

View File

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

View File

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