summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-09-17 02:42:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 09:54:32 (GMT)
commitfc94afe15e7c0e194bb7f93a2e39d461131b6e40 (patch)
treef237c35a6f77fa391ee95c5b6a43f5b4a5259b79 /meta/recipes-core
parentd785e295d5fb449bacff41c1bf3ac8b1c238cd1e (diff)
downloadpoky-fc94afe15e7c0e194bb7f93a2e39d461131b6e40.tar.gz
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. (From OE-Core rev: f66c02130d11154088d86c96fedd88e9d2bca723) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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 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 () {
97 # The dynamic loader will have been installed into 97 # The dynamic loader will have been installed into
98 # ${base_libdir}. However, if that isn't going to end up being 98 # ${base_libdir}. However, if that isn't going to end up being
99 # available in the ABI-mandated location, then a symlink must 99 # available in the ABI-mandated location, then a symlink must
100 # be created. 100 # be created.
101 101
102 if [ -n "${ARCH_DYNAMIC_LOADER}" -a ! -e "${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}" ]; then 102 if [ -n "${ARCH_DYNAMIC_LOADER}" -a ! -e "${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}" ]; then
103 install -d ${D}${root_prefix}/lib 103 install -d ${D}${root_prefix}/lib
@@ -111,8 +111,6 @@ do_install_append_class-target() {
111 # The distro doesn't want these files so let's not install them 111 # The distro doesn't want these files so let's not install them
112 rm -f ${D}${sysconfdir}/ld.so.conf 112 rm -f ${D}${sysconfdir}/ld.so.conf
113 rm -f ${D}${base_sbindir}/ldconfig 113 rm -f ${D}${base_sbindir}/ldconfig
114 # This directory will be empty now so remove it too.
115 rmdir ${D}${sysconfdir}
116 fi 114 fi
117 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 115 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
118 install -d ${D}${sysconfdir}/tmpfiles.d 116 install -d ${D}${sysconfdir}/tmpfiles.d