summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-09-17 04:42:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 10:54:26 +0100
commitf66c02130d11154088d86c96fedd88e9d2bca723 (patch)
treecca28dba7acc6e6dd66e6929562b0680fd86b057
parent89251c2227c38b528b52d56a59ffbe44f1af9cd3 (diff)
downloadopenembedded-core-contrib-f66c02130d11154088d86c96fedd88e9d2bca723.tar.gz
openembedded-core-contrib-f66c02130d11154088d86c96fedd88e9d2bca723.tar.bz2
openembedded-core-contrib-f66c02130d11154088d86c96fedd88e9d2bca723.zip
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@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 2e8f9f3e02..d7037c5cce 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