diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/rootfs.py | 2 | ||||
-rw-r--r-- | 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): | |||
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" | |||
23 | libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" | 23 | libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" |
24 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" | 24 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" |
25 | 25 | ||
26 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/*" | 26 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" |
27 | RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" | 27 | RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" |
28 | FILES_ldconfig = "${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" | 28 | FILES_ldconfig = "${base_sbindir}/ldconfig" |
29 | FILES_ldd = "${bindir}/ldd" | 29 | FILES_ldd = "${bindir}/ldd" |
30 | FILES_libsegfault = "${base_libdir}/libSegFault*" | 30 | FILES_libsegfault = "${base_libdir}/libSegFault*" |
31 | FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" | 31 | FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" |