1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00

package.bbclass: Always include ldconfig fragment

Now that ldconfig may get installed from a feed, use it when it's
available on the target.

(From OE-Core rev: 0f09f19dc48edf2ac50b554c18c217b7f97d4ae3)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andreas Oberritter
2019-11-07 21:49:42 +01:00
committed by Richard Purdie
parent 27c0553e70
commit fcd86247ff
+1 -3
View File
@@ -1731,8 +1731,6 @@ python package_do_shlibs() {
else: else:
snap_symlinks = False snap_symlinks = False
use_ldconfig = bb.utils.contains('DISTRO_FEATURES', 'ldconfig', True, False, d)
needed = {} needed = {}
shlib_provider = oe.package.read_shlib_providers(d) shlib_provider = oe.package.read_shlib_providers(d)
@@ -1791,7 +1789,7 @@ python package_do_shlibs() {
if s[0] not in shlib_provider: if s[0] not in shlib_provider:
shlib_provider[s[0]] = {} shlib_provider[s[0]] = {}
shlib_provider[s[0]][s[1]] = (pkg, pkgver) shlib_provider[s[0]][s[1]] = (pkg, pkgver)
if needs_ldconfig and use_ldconfig: if needs_ldconfig:
bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg)
postinst = d.getVar('pkg_postinst_%s' % pkg) postinst = d.getVar('pkg_postinst_%s' % pkg)
if not postinst: if not postinst: