From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.pbcl.net ([88.198.119.4] helo=hetzner.pbcl.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QgvPw-000672-Ep for openembedded-core@lists.openembedded.org; Wed, 13 Jul 2011 11:07:40 +0200 Received: from cambridge.roku.com ([81.142.160.137] helo=[172.30.1.145]) by hetzner.pbcl.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1QgvM8-0004OX-34 for openembedded-core@lists.openembedded.org; Wed, 13 Jul 2011 11:03:44 +0200 From: Phil Blundell To: oe-core Date: Wed, 13 Jul 2011 10:03:42 +0100 X-Mailer: Evolution 3.0.2- Message-ID: <1310547824.6337.212.camel@phil-desktop> Mime-Version: 1.0 Subject: [PATCH] eglibc: ensure that NSS libs go into the right package when ${base_libdir} and ${libdir} are the same X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2011 09:07:40 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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 --- meta/recipes-core/eglibc/eglibc-package.inc | 4 ++-- 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 dd40af1..1a9953d 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 be65787..ec88d9d 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" -- 1.7.4.1