From: Ming Liu <ming....@windriver.com>
There are advantages in changing the contents of ld.so.conf to
"include /etc/ld.so.conf.d/*.conf" instead of directly listing directories
in it, just like most distributions are doing the same.
Signed-off-by: Ming Liu <ming....@windriver.com>
---
meta/recipes-core/eglibc/eglibc-package.inc | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc
b/meta/recipes-core/eglibc/eglibc-package.inc
index 3adf1a9..b46cc3b 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -33,7 +33,7 @@ RPROVIDES_${PN}-pcprofile = "glibc-pcprofile"
RPROVIDES_${PN}-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} = "${libc_baselibs} ${libexecdir}/*
${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig
${sysconfdir}/ld.so.conf', '', d)}"
+FILES_${PN} = "${libc_baselibs} ${libexecdir}/*
${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig
${sysconfdir}/ld.so.conf ${sysconfdir}/ld.so.conf.d', '', d)}"
FILES_ldd = "${bindir}/ldd"
FILES_libsegfault = "${base_libdir}/libSegFault*"
FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
@@ -97,6 +97,11 @@ do_install_append () {
if [ -d ${D}${sysconfdir} ]; then
rmdir ${D}${sysconfdir}
fi
+ else
+ if [ -f ${D}${sysconfdir}/ld.so.conf ]; then
+ echo 'include ld.so.conf.d/*.conf' >
${D}${sysconfdir}/ld.so.conf
+ mkdir -p ${D}${sysconfdir}/ld.so.conf.d
+ fi
fi
}
--
1.7.5.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
