[oe-commits] Richard Purdie : Revert "eglibc: fix packaging of some of nativesdk packages"

[git version control]

Module: openembedded-core.git
Branch: master
Commit: 7ef6b83e92d4d67d61591cea95313929435b8af7
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7ef6b83e92d4d67d61591cea95313929435b8af7

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Sep 22 20:50:35 2011 +0100

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

---

 meta/recipes-core/eglibc/eglibc-locale.inc  |   13 ++++---------
 meta/recipes-core/eglibc/eglibc-package.inc |    9 ++-------
 meta/recipes-core/eglibc/eglibc_2.12.bb     |    2 +-
 meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index cfc7d84..d9720e4 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -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"
-
-python __anonymous () {
-    import bb
-    if bb.data.inherits_class("nativesdk", d):
-        bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
-    else:
-        bb.data.setVar("PKGSUFFIX", "", d)
-}
+PR = "r18"
+
+PKGSUFFIX = ""
+PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
 PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
 
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index dc6fce0..519a49c 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -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}"
 
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 7a1a569..0fbd070 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -1,7 +1,7 @@
 require eglibc.inc
 
 DEPENDS += "gperf-native"
-PR = "r25"
+PR = "r26"
 
 SRCREV = "14158"
 
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index e172785..fc8ac64 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -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"