diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2010-12-15 11:56:43 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-12-15 18:16:04 -0800 |
| commit | 0bc418b260359c080d42d5654f082f09df4389d4 (patch) | |
| tree | 09851f687d865c74e87e37e6afaab07e1f80525a /recipes/eglibc | |
| parent | 5316c5b1416391f15277ce867489e525b7eccd6e (diff) | |
| download | openembedded-0bc418b260359c080d42d5654f082f09df4389d4.tar.gz | |
eglibc: Do not install /etc/localtime
* /etc/localtime is installed by separate time zone package
* Pack libcidn properly into separate package, currently the library is
in separate package but symlink is in libc6
* pack nscd related files into nscd package
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/eglibc')
| -rw-r--r-- | recipes/eglibc/eglibc-package.inc | 13 | ||||
| -rw-r--r-- | recipes/eglibc/eglibc.inc | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/recipes/eglibc/eglibc-package.inc b/recipes/eglibc/eglibc-package.inc index baf03df67c..0886711a60 100644 --- a/recipes/eglibc/eglibc-package.inc +++ b/recipes/eglibc/eglibc-package.inc @@ -54,19 +54,24 @@ RPROVIDES_eglibc-extra-nss = "glibc-extra-nss" RPROVIDES_eglibc-thread-db = "glibc-thread-db" 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" +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)}" +# The problem is that if PN = "eglibc", FILES_${PN} will overwrite FILES_eglibc +# Solution: Make them both the same thing, then it doesn't matter + +libcfiles = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}" +FILES_eglibc = "${libcfiles}" +FILES_${PN} = "${libcfiles}" FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" -FILES_libcidn = "${base_libdir}/libcidn*.so" +FILES_libcidn = "${base_libdir}/libcidn*.so ${base_libdir}/libcidn*.so.*" FILES_libmemusage = "${base_libdir}/libmemusage.so" FILES_eglibc-extra-nss = "${base_libdir}/libnss*" FILES_sln = "/sbin/sln" FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" -FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" +FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*" FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" FILES_eglibc-gconv = "${libdir}/gconv/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug" diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc index 41bed746c8..0644d495ec 100644 --- a/recipes/eglibc/eglibc.inc +++ b/recipes/eglibc/eglibc.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home" SECTION = "libs" PRIORITY = "required" LICENSE = "LGPL" -INC_PR = "r18" +INC_PR = "r19" # nptl needs unwind support in gcc, which can't be built without glibc. DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet |