On Wed, 2025-01-08 at 08:15 +0100, Benjamin Bara via lists.openembedded.org wrote: > From: Benjamin Bara <benjamin.b...@skidata.com> > > Otherwise, installing ldconfig via multilib results in overwriting. > > Signed-off-by: Benjamin Bara <benjamin.b...@skidata.com> > --- > meta/recipes-core/glibc/glibc-package.inc | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > 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 > }
I'm a bit puzzled by what would use this in real world use. Do you have systems where you have two different ld caches? Can our postinst code call the right prefixed ldconfig binaries? I merged the other patches in the series, thanks. Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#209672): https://lists.openembedded.org/g/openembedded-core/message/209672 Mute This Topic: https://lists.openembedded.org/mt/110493153/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-