mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

eglibc: ensure that NSS libs go into the right package when ${base_libdir} and ${libdir} are the same

Browse Source 
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.

(From OE-Core rev: 585e46e089e8863c8970a9c7c02159805e3e479a)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Phil Blundell
2011-07-13 10:03:42 +01:00
committed by Richard Purdie
parent 6aa76f9f27
commit c3a8e964a5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/eglibc/eglibc-package.inc
+2 -2
View File
@@ -20,7 +20,7 @@ USE_LDCONFIG ?= "1"
PKGSUFFIX = "" PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 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 # Create a eglibc-binaries
ALLOW_EMPTY_${PN}-binaries = "1" ALLOW_EMPTY_${PN}-binaries = "1"
@@ -58,7 +58,7 @@ FILES_ldd${PKGSUFFIX} = "${bindir}/ldd"
FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*"
FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
FILES_libmemusage = "${base_libdir}/libmemusage.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_sln = "/sbin/sln"
FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so" FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so"
meta/recipes-core/eglibc/eglibc_2.13.bb
+1 -1
View File
@@ -4,7 +4,7 @@ SRCREV = "14157"
DEPENDS += "gperf-native" DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:" FILESPATHPKG =. "eglibc-svn:"
PR = "r6" PR = "r7"
PR_append = "+svnr${SRCPV}" PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13" EGLIBC_BRANCH="eglibc-2_13"