summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 20:50:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 21:03:14 +0100
commit2a7870778f141b2f29271405ee62b06cc4856920 (patch)
treec09f984c0878de3802918c1427c5611f57091bc1
parentf4b4432b7499bbb5056f615baa739aeaaea701cf (diff)
downloadpoky-2a7870778f141b2f29271405ee62b06cc4856920.tar.gz
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>
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc13
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc9
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.13.bb2
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 cfc7d84eb9..d9720e487b 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"
26# set "0" for qemu emulation of native localedef for locale generation 26# set "0" for qemu emulation of native localedef for locale generation
27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" 27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
28 28
29PR = "r17" 29PR = "r18"
30 30
31python __anonymous () { 31PKGSUFFIX = ""
32 import bb 32PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
33 if bb.data.inherits_class("nativesdk", d):
34 bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
35 else:
36 bb.data.setVar("PKGSUFFIX", "", d)
37}
38 33
39PROVIDES = "virtual/libc-locale${PKGSUFFIX}" 34PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
40 35
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index dc6fce0442..519a49c75f 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -17,13 +17,8 @@ python __anonymous () {
17# Set this to zero if you don't want ldconfig in the output package 17# Set this to zero if you don't want ldconfig in the output package
18USE_LDCONFIG ?= "1" 18USE_LDCONFIG ?= "1"
19 19
20python __anonymous () { 20PKGSUFFIX = ""
21 import bb 21PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
22 if bb.data.inherits_class("nativesdk", d):
23 bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
24 else:
25 bb.data.setVar("PKGSUFFIX", "", d)
26}
27 22
28PACKAGES = "${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}" 23PACKAGES = "${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}"
29 24
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 7a1a5695fe..0fbd070497 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -1,7 +1,7 @@
1require eglibc.inc 1require eglibc.inc
2 2
3DEPENDS += "gperf-native" 3DEPENDS += "gperf-native"
4PR = "r25" 4PR = "r26"
5 5
6SRCREV = "14158" 6SRCREV = "14158"
7 7
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index e172785c69..fc8ac64a1c 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
3SRCREV = "14157" 3SRCREV = "14157"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r16" 6PR = "r17"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_13" 9EGLIBC_BRANCH="eglibc-2_13"