diff mbox series

[3/4] glibc-package: move ldconfig to ML-specific file

Message ID 20250108071513.2807528-3-bbara93@gmail.com
State New
Headers show
Series [1/4] multilib.conf: overwrite conf files for debs | expand

Commit Message

Benjamin Bara Jan. 8, 2025, 7:15 a.m. UTC 
From: Benjamin Bara <benjamin.bara@skidata.com>

Otherwise, installing ldconfig via multilib results in overwriting.

Signed-off-by: Benjamin Bara <benjamin.bara@skidata.com>
---
 meta/recipes-core/glibc/glibc-package.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index ad34b87929..1e7f3753c2 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -28,7 +28,7 @@  INSANE_SKIP:${MLPREFIX}ldso:append = " dev-so libdir"
 FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf"
 CONFFILES:${PN} = "${sysconfdir}/ld.so.conf"
 RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}"
-FILES:ldconfig = "${base_sbindir}/ldconfig"
+FILES:ldconfig = "${base_sbindir}/${MLPREFIX}ldconfig"
 FILES:ldd = "${bindir}/ldd"
 FILES:ldso = "${bindir}/${MLPREFIX}ld.so"
 FILES:libmemusage = "${base_libdir}/libmemusage.so"
@@ -123,6 +123,7 @@  do_install() {
         ln -rs ${D}${base_libdir}/librt.so.1 ${D}${libdir}/librt.so
         if [ -n "${MLPREFIX}" ]; then
                 mv ${D}${bindir}/ld.so ${D}${bindir}/${MLPREFIX}ld.so
+                mv ${D}${base_sbindir}/ldconfig ${D}${base_sbindir}/${MLPREFIX}ldconfig
         fi
 }