aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/glibc
diff options
context:
space:
mode:
authorStanislav Brabec <utx@penguin.cz>2009-08-27 11:11:23 +0000
committerutx@penguin.cz <utx@penguin.cz>2009-08-27 11:11:23 +0000
commit13090db2af21ee0018c4e565556edcab40a84507 (patch)
treeb49447e1e89555b0e83312b86d29bd5d17ac9953 /recipes/glibc
parentf4dd0b700506c6fee2fb07ebdf6e6c6c16f2cff3 (diff)
downloadopenembedded-13090db2af21ee0018c4e565556edcab40a84507.tar.gz
glibc-package.bbclass: Reverted 056a67f6070c5ea561acb65049b551e24f3b7eb6.
* see http://lists.linuxtogo.org/pipermail/openembedded-devel/2009-August/013429.html
Diffstat (limited to 'recipes/glibc')
-rw-r--r--recipes/glibc/glibc-package.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass
index 32ea0e3313..69b569e346 100644
--- a/recipes/glibc/glibc-package.bbclass
+++ b/recipes/glibc/glibc-package.bbclass
@@ -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 ${sysconfdir}/ld.so.conf', '', d)}"
+FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}"
FILES_ldd = "${bindir}/ldd"
FILES_libsegfault = "${base_libdir}/libSegFault*"
FILES_glibc-extra-nss = "${base_libdir}/libnss*"
@@ -91,7 +91,6 @@ do_install() {
rm -f ${D}{sysconfdir}/rpc
install -d ${D}${sysconfdir}/init.d
install -m 0644 ${S}/nscd/nscd.conf ${D}${sysconfdir}/
- install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}${sysconfdir}/
install ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd
}