On Tue, Jun 2, 2020 at 5:17 AM Rasmus Villemoes <[email protected]> wrote: > > There are cases where one doesn't want ldconfig on target (e.g. for > read-only root filesystems, it's rather pointless), yet one still > needs ld.so.conf to be present at image build time: > > When some recipe installs libraries to a non-standard location, and > dutifully drops in a file in /etc/ld.so.conf.d/foo.conf, we need the > ld.so.conf containing the > > include /etc/ld.so.conf.d/*.conf > > stanza to get those other locations picked up. > > So change the packaging logic so that there's always an ld.so.conf > present when the build-time ldconfig runs. > > The ld.so.conf and ld.so.conf.d/*.conf files don't take up much > room (at least not compared to the 700K binary ldconfig), and they > might be needed in case ldconfig is installable, so leave them > alone. > > In case of a read-only rootfs, one could add some logic to remove them > if one really wants to shave those few dozens of bytes off. > > While here, fix typos in the bb.note (add spaces) so one can just > copy-paste the line from the log-file and redo the command. >
The patch, in essence, looks ok, have you considered the feeds based distro's case will it keep working for them, or if there are changes e.g. they must include ldconfig compulsory etc. then it should be documented. > Signed-off-by: Rasmus Villemoes <[email protected]> > --- > > v3: rebase to master > > v2: don't delete the configuration file(s) - that's also a much > simpler patch. > > meta/lib/oe/rootfs.py | 2 +- > meta/recipes-core/glibc/glibc-package.inc | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py > index cd65e62030..a0ac33ada6 100644 > --- a/meta/lib/oe/rootfs.py > +++ b/meta/lib/oe/rootfs.py > @@ -297,7 +297,7 @@ class Rootfs(object, metaclass=ABCMeta): > > def _run_ldconfig(self): > if self.d.getVar('LDCONFIGDEPEND'): > - bb.note("Executing: ldconfig -r" + self.image_rootfs + "-c new > -v") > + bb.note("Executing: ldconfig -r " + self.image_rootfs + " -c new > -v") > self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c', > 'new', '-v']) > > diff --git a/meta/recipes-core/glibc/glibc-package.inc > b/meta/recipes-core/glibc/glibc-package.inc > index ff25fd4187..5f1ab60dc6 100644 > --- a/meta/recipes-core/glibc/glibc-package.inc > +++ b/meta/recipes-core/glibc/glibc-package.inc > @@ -23,9 +23,9 @@ ARCH_DYNAMIC_LOADER_aarch64 = "ld-linux-${TARGET_ARCH}.so.1" > libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', > '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" > INSANE_SKIP_${PN}_append_aarch64 = " libdir" > > -FILES_${PN} = "${libc_baselibs} ${libexecdir}/*" > +FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" > RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', > '${MLPREFIX}ldconfig', '', d)}" > -FILES_ldconfig = "${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" > +FILES_ldconfig = "${base_sbindir}/ldconfig" > FILES_ldd = "${bindir}/ldd" > FILES_libsegfault = "${base_libdir}/libSegFault*" > FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" > -- > 2.23.0 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139108): https://lists.openembedded.org/g/openembedded-core/message/139108 Mute This Topic: https://lists.openembedded.org/mt/74625854/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
