diff options
| author | Phil Blundell <philb@gnu.org> | 2011-07-13 10:03:42 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-13 12:08:18 +0100 |
| commit | 585e46e089e8863c8970a9c7c02159805e3e479a (patch) | |
| tree | ff7940ca3001f13ccb6978cd99a57f0d3ea0779f /meta/recipes-core | |
| parent | 1ec48876d36a415fcd5816c1e4de17f8794b367b (diff) | |
| download | openembedded-core-585e46e089e8863c8970a9c7c02159805e3e479a.tar.gz openembedded-core-585e46e089e8863c8970a9c7c02159805e3e479a.tar.bz2 openembedded-core-585e46e089e8863c8970a9c7c02159805e3e479a.zip | |
eglibc: ensure that NSS libs go into the right package when ${base_libdir} and ${libdir} are the same
Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
that the devel symlinks don't get caught.
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index dd40af1e08..1a9953d61c 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -20,7 +20,7 @@ USE_LDCONFIG ?= "1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}" +PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}" # Create a eglibc-binaries ALLOW_EMPTY_${PN}-binaries = "1" @@ -58,7 +58,7 @@ FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" FILES_libmemusage = "${base_libdir}/libmemusage.so" -FILES_eglibc-extra-nss = "${base_libdir}/libnss*" +FILES_eglibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" FILES_sln = "/sbin/sln" FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so" diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index be65787a9b..ec88d9dbfe 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -4,7 +4,7 @@ SRCREV = "14157" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR = "r6" +PR = "r7" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13" |