summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-09-21 22:39:58 +0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 08:49:10 +0100
commitf800862555b81dec65f3de09a2f7b1a0c97a09c1 (patch)
treec5b243129b9821eb16c80ba4d1d66eca074c2fe9 /meta/recipes-core
parentcac6eb9c11b5e94d71b894bf26bab288d99f0e1d (diff)
downloadpoky-f800862555b81dec65f3de09a2f7b1a0c97a09c1.tar.gz
eglibc: fix packaging of some of nativesdk packages
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>
Diffstat (limited to 'meta/recipes-core')
-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, 18 insertions, 8 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 9424ff577a..cfc7d84eb9 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,10 +26,15 @@ 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 = "r16" 29PR = "r17"
30 30
31PKGSUFFIX = "" 31python __anonymous () {
32PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 32 import bb
33 if bb.data.inherits_class("nativesdk", d):
34 bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
35 else:
36 bb.data.setVar("PKGSUFFIX", "", d)
37}
33 38
34PROVIDES = "virtual/libc-locale${PKGSUFFIX}" 39PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
35 40
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 519a49c75f..dc6fce0442 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -17,8 +17,13 @@ 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
20PKGSUFFIX = "" 20python __anonymous () {
21PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 21 import bb
22 if bb.data.inherits_class("nativesdk", d):
23 bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
24 else:
25 bb.data.setVar("PKGSUFFIX", "", d)
26}
22 27
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}" 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}"
24 29
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index a9d208b756..7a1a5695fe 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 = "r24" 4PR = "r25"
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 b549496c26..e172785c69 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 = "r15" 6PR = "r16"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_13" 9EGLIBC_BRANCH="eglibc-2_13"