diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-09-21 22:39:58 +0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-22 08:49:10 +0100 |
commit | f800862555b81dec65f3de09a2f7b1a0c97a09c1 (patch) | |
tree | c5b243129b9821eb16c80ba4d1d66eca074c2fe9 /meta/recipes-core/eglibc/eglibc-package.inc | |
parent | cac6eb9c11b5e94d71b894bf26bab288d99f0e1d (diff) | |
download | poky-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/eglibc/eglibc-package.inc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 9 |
1 files changed, 7 insertions, 2 deletions
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 |
18 | USE_LDCONFIG ?= "1" | 18 | USE_LDCONFIG ?= "1" |
19 | 19 | ||
20 | PKGSUFFIX = "" | 20 | python __anonymous () { |
21 | PKGSUFFIX_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 | ||
23 | 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}" | 28 | 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}" |
24 | 29 | ||