glibc: Install ld.so.conf, so ldconfig does not complain.
authorStanislav Brabec <utx@penguin.cz>
Wed, 26 Aug 2009 21:05:59 +0000 (21:05 +0000)
committerutx@penguin.cz <utx@penguin.cz>
Wed, 26 Aug 2009 21:05:59 +0000 (21:05 +0000)
recipes/glibc/glibc-package.bbclass

index 0127646..1ed1b7a 100644 (file)
@@ -36,7 +36,7 @@ INSANE_SKIP_glibc-dbg = True
 
 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}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}"
+FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
 FILES_ldd = "${bindir}/ldd"
 FILES_libsegfault = "${base_libdir}/libSegFault*"
 FILES_glibc-extra-nss = "${base_libdir}/libnss*"
@@ -83,7 +83,9 @@ do_install() {
                grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
                mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
        done
-       rm -f ${D}/etc/rpc
+       rm -f ${D}{sysconfdir}/rpc
+       install -d ${D}${sysconfdir}
+       install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}${sysconfdir}/
 }
 
 TMP_LOCALE="/tmp/locale${libdir}/locale"