summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package.bbclass5
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc9
3 files changed, 5 insertions, 11 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index ac2d71cfa4..d5c2d82bc8 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1618,10 +1618,7 @@ python package_do_shlibs() {
1618 else: 1618 else:
1619 snap_symlinks = False 1619 snap_symlinks = False
1620 1620
1621 if (d.getVar('USE_LDCONFIG') or "1") == "1": 1621 use_ldconfig = bb.utils.contains('DISTRO_FEATURES', 'ldconfig', True, False, d)
1622 use_ldconfig = True
1623 else:
1624 use_ldconfig = False
1625 1622
1626 needed = {} 1623 needed = {}
1627 shlib_provider = oe.package.read_shlib_providers(d) 1624 shlib_provider = oe.package.read_shlib_providers(d)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ade0eff609..f9df7cacd1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -769,7 +769,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
769EXTRA_IMAGE_FEATURES ??= "" 769EXTRA_IMAGE_FEATURES ??= ""
770IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" 770IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
771 771
772DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data" 772DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data ldconfig"
773MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" 773MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
774 774
775COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" 775COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}"
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index f0fc9c1cc4..a674c23799 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -14,9 +14,6 @@ python __anonymous () {
14 d.getVar('TARGET_OS')) 14 d.getVar('TARGET_OS'))
15} 15}
16 16
17# Set this to zero if you don't want ldconfig in the output package
18USE_LDCONFIG ?= "1"
19
20INHIBIT_SYSROOT_STRIP = "1" 17INHIBIT_SYSROOT_STRIP = "1"
21 18
22PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode ${PN}-utils glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" 19PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode ${PN}-utils glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
@@ -37,7 +34,7 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba
37libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" 34libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1"
38INSANE_SKIP_${PN}_append_aarch64 = " libdir" 35INSANE_SKIP_${PN}_append_aarch64 = " libdir"
39 36
40FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" 37FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"
41FILES_ldd = "${bindir}/ldd" 38FILES_ldd = "${bindir}/ldd"
42FILES_libsegfault = "${base_libdir}/libSegFault*" 39FILES_libsegfault = "${base_libdir}/libSegFault*"
43FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" 40FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
@@ -96,8 +93,8 @@ do_install_append () {
96 rm -f ${D}${infodir}/dir 93 rm -f ${D}${infodir}/dir
97 fi 94 fi
98 95
99 if [ "${USE_LDCONFIG}" != "1" ]; then 96 if ! ${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', 'true', 'false', d)}; then
100 # We won't ship these files (see FILES above) so let's not install them 97 # The distro doesn't want these files so let's not install them
101 rm -f ${D}${sysconfdir}/ld.so.conf 98 rm -f ${D}${sysconfdir}/ld.so.conf
102 rm -f ${D}${base_sbindir}/ldconfig 99 rm -f ${D}${base_sbindir}/ldconfig
103 # This directory will be empty now so remove it too. 100 # This directory will be empty now so remove it too.