From 6dca14314accf35b22e178a1c26fe5d86e57a111 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 23 Dec 2010 15:50:31 +0000 Subject: eglibc: Only package ld.so.conf, not /etc/rpc which then conflicts with netbase Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 87c3393d00..bf944a54c1 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -56,7 +56,7 @@ RPROVIDES_eglibc-pcprofile = "glibc-pcprofile" RPROVIDES_eglibc-dbg = "glibc-dbg" libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc*.so.* ${base_libdir}/libc*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" -FILES_${PN} = "${sysconfdir} ${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}" +FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" FILES_libcidn = "${base_libdir}/libcidn*.so" diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 3d0dc7387a..c773af0efa 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -2,7 +2,7 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR = "r12" +PR = "r13" EGLIBC_BRANCH="eglibc-2_12" SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \ -- cgit v1.2.3-54-g00ecf