[oe-commits] [openembedded-core] 09/16: glibc: re-package for libnss-db

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 1aa88849978bf6f3018d794bc1fcca385c26405e
Author: Jackie Huang <jackie.huang at windriver.com>
AuthorDate: Thu Nov 2 14:40:39 2017 +0800

    glibc: re-package for libnss-db
    
    On other distros like ubuntu/centos, libnss-db usually provides:
    - The libraries
    - The Makefile to create database
      (in /var/db for centos, /var/lib/misc/ for ubuntu)
    - The makedb command (it's in glibc-common for centos7)
    
    What we had is:
    - The libraries are in glibc-extra-nss
    - The Makefile is removed
    - The makedb command is in glibc-utils (lack of dependency)
    
    So when glibc-extra-nss is installed but glibc-utils is not,
    we see error like:
    nscd[165]: 165 checking for monitored file `/var/db/group.db': No such file or directory
    nscd[165]: 165 checking for monitored file `/var/db/passwd.db': No such file or directory
    
    And there is not an easy way to create these databases.
    
    To fix the issue:
    - Re-package the libraries into libnss-db
    - Don't remove the Makefile and add it in libnss-db
    - Add RDEPENDS for libnss-db on glibc-utils and make
    
    Notes:
    For external toolchain, an extra package 'libnss-db' need to be provided
    If replacing glibc from core.
    
    Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/glibc/glibc-package.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index df3db2c..1c3782d 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -1,6 +1,6 @@
 INHIBIT_SYSROOT_STRIP = "1"
 
-PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
+PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
 
 # The ld.so in this glibc supports the GNU_HASH
 RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)"
@@ -23,6 +23,8 @@ FILES_ldd = "${bindir}/ldd"
 FILES_libsegfault = "${base_libdir}/libSegFault*"
 FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
 FILES_libmemusage = "${base_libdir}/libmemusage.so"
+FILES_libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile"
+RDEPENDS_libnss-db = "${PN}-utils make"
 FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
 FILES_sln = "${base_sbindir}/sln"
 FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o"
@@ -59,7 +61,6 @@ inherit libc-common multilib_header
 
 do_install_append () {
 	rm -f ${D}${sysconfdir}/localtime
-	rm -rf ${D}${localstatedir}
 
 	# remove empty glibc dir
 	if [ -d ${D}${libexecdir} ]; then

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.