/var/db/Makefile and /opt/(sdk path)/etc/ld.so.conf were not
being properly handled by the do_package task in
eglibc-nativesdk.  /var/db is now deleted and /etc/ld.so.conf
is being included in the -utils subpackage.

Signed-off-by: Rich Dubielzig <[email protected]>
---
 meta/recipes-core/eglibc/eglibc-package.inc |    3 ++-
 meta/recipes-core/eglibc/eglibc_2.15.bb     |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc 
b/meta/recipes-core/eglibc/eglibc-package.inc
index 3298dea..d51d943 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -50,7 +50,7 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen 
${libdir}/*_nonshared.a \
 FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"
 FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
 FILES_${PN}-mtrace = "${bindir}/mtrace"
-FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
+FILES_${PN}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig 
${sysconfdir}/ld.so.conf"
 FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug"
 FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv"
 RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault"
@@ -121,5 +121,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
 eglibc_package_preprocess () {
        rm -rf 
${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
        rm -rf ${PKGD}/${libdir}/locale
+       rm -rf ${PKGD}/var
 }
 
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb 
b/meta/recipes-core/eglibc/eglibc_2.15.bb
index fe93b4b..b4bf692 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "17386"
 
 DEPENDS += "gperf-native"
-PR = "r11"
+PR = "r12"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"
-- 
1.7.1


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to