summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2019-11-07 21:49:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-11 14:07:08 +0000
commit27c0553e7098f19316d6655413bc03b53a86a87b (patch)
treec71452eee0cf08bf304cc1d12ecdae5dda816069
parent93b2c25ee7abe524c49f79255466899165ceac75 (diff)
downloadpoky-27c0553e7098f19316d6655413bc03b53a86a87b.tar.gz
glibc: move ldconfig to its own package
Only recommend its installation, if it's enabled in distro features. (From OE-Core rev: fda7cd9328ba26e0023d7ddfaa23f73b59443a08) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc11
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index d7037c5cce..9dd5a0d403 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -1,6 +1,6 @@
1INHIBIT_SYSROOT_STRIP = "1" 1INHIBIT_SYSROOT_STRIP = "1"
2 2
3PACKAGES = "${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" 3PACKAGES = "${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 ldconfig"
4 4
5# The ld.so in this glibc supports the GNU_HASH 5# The ld.so in this glibc supports the GNU_HASH
6RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)" 6RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)"
@@ -23,7 +23,9 @@ ARCH_DYNAMIC_LOADER_aarch64 = "ld-linux-${TARGET_ARCH}.so.1"
23libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" 23libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}"
24INSANE_SKIP_${PN}_append_aarch64 = " libdir" 24INSANE_SKIP_${PN}_append_aarch64 = " libdir"
25 25
26FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" 26FILES_${PN} = "${libc_baselibs} ${libexecdir}/*"
27RRECOMMENDS_${PN} = "${@bb.utils.filter('DISTRO_FEATURES', 'ldconfig', d)}"
28FILES_ldconfig = "${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"
27FILES_ldd = "${bindir}/ldd" 29FILES_ldd = "${bindir}/ldd"
28FILES_libsegfault = "${base_libdir}/libSegFault*" 30FILES_libsegfault = "${base_libdir}/libSegFault*"
29FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" 31FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
@@ -107,11 +109,6 @@ do_install_append () {
107} 109}
108 110
109do_install_append_class-target() { 111do_install_append_class-target() {
110 if ! ${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', 'true', 'false', d)}; then
111 # The distro doesn't want these files so let's not install them
112 rm -f ${D}${sysconfdir}/ld.so.conf
113 rm -f ${D}${base_sbindir}/ldconfig
114 fi
115 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 112 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
116 install -d ${D}${sysconfdir}/tmpfiles.d 113 install -d ${D}${sysconfdir}/tmpfiles.d
117 echo "d /run/nscd 755 root root -" \ 114 echo "d /run/nscd 755 root root -" \