[oe-commits] [openembedded-core] 23/24: glibc: Make it build without ldconfig in DISTRO_FEATURES

[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 9aa1d54d67cecf8d736f465f51171975b469c439
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Tue Sep 17 04:42:18 2019 +0200

    glibc: Make it build without ldconfig in DISTRO_FEATURES
    
    The removal of the supposedly empty /etc when ldconfig is not in
    DISTRO_FEATURES seems to be a remnant from a long time ago when nothing
    else was installed in /etc. However, that is no longer the case as,
    e.g., nscd.conf is always installed to /etc now.
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/glibc/glibc-package.inc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 2e8f9f3..d7037c5 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -97,7 +97,7 @@ do_install_append () {
 	# The dynamic loader will have been installed into
 	# ${base_libdir}. However, if that isn't going to end up being
 	# available in the ABI-mandated location, then a symlink must
-        # be created.
+	# be created.
 
 	if [ -n "${ARCH_DYNAMIC_LOADER}" -a ! -e "${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}" ]; then
 		install -d ${D}${root_prefix}/lib
@@ -111,8 +111,6 @@ do_install_append_class-target() {
 		# The distro doesn't want these files so let's not install them
 		rm -f ${D}${sysconfdir}/ld.so.conf
 		rm -f ${D}${base_sbindir}/ldconfig
-		# This directory will be empty now so remove it too.
-		rmdir ${D}${sysconfdir}
 	fi
 	if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
 		install -d ${D}${sysconfdir}/tmpfiles.d

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