summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2020-06-02 14:17:22 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-09 13:13:59 +0100
commit6710572f90101e3a7af67c31d118d977eb78d151 (patch)
treec42d5f582fb82df2f3fbe4d05ed230b9dab0258b /meta
parentb66b9f7548dba35f240ff9f810debe67b72bfb63 (diff)
downloadpoky-6710572f90101e3a7af67c31d118d977eb78d151.tar.gz
glibc: move ld.so.conf back to main package
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. (From OE-Core rev: a4cdda012f613d8d80203b9f5fc737d8511d16ce) Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/rootfs.py2
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc4
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):
297 297
298 def _run_ldconfig(self): 298 def _run_ldconfig(self):
299 if self.d.getVar('LDCONFIGDEPEND'): 299 if self.d.getVar('LDCONFIGDEPEND'):
300 bb.note("Executing: ldconfig -r" + self.image_rootfs + "-c new -v") 300 bb.note("Executing: ldconfig -r " + self.image_rootfs + " -c new -v")
301 self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c', 301 self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c',
302 'new', '-v']) 302 'new', '-v'])
303 303
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"
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}/*" 26FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf"
27RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" 27RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}"
28FILES_ldconfig = "${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" 28FILES_ldconfig = "${base_sbindir}/ldconfig"
29FILES_ldd = "${bindir}/ldd" 29FILES_ldd = "${bindir}/ldd"
30FILES_libsegfault = "${base_libdir}/libSegFault*" 30FILES_libsegfault = "${base_libdir}/libSegFault*"
31FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" 31FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"