]> code.ossystems Code Review - openembedded-core.git/commitdiff
package.bbclass: Always include ldconfig fragment
authorAndreas Oberritter <obi@opendreambox.org>
Thu, 7 Nov 2019 20:49:42 +0000 (21:49 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Nov 2019 14:07:00 +0000 (14:07 +0000)
Now that ldconfig may get installed from a feed, use it when it's
available on the target.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/package.bbclass

index f955df11118313d04e2231330a5546edca668b8b..e0d6ff67018a0346d79f225b406eb868e2454a54 100644 (file)
@@ -1731,8 +1731,6 @@ python package_do_shlibs() {
     else:
         snap_symlinks = False
 
-    use_ldconfig = bb.utils.contains('DISTRO_FEATURES', 'ldconfig', True, False, d)
-
     needed = {}
 
     shlib_provider = oe.package.read_shlib_providers(d)
@@ -1791,7 +1789,7 @@ python package_do_shlibs() {
                     if s[0] not in shlib_provider:
                         shlib_provider[s[0]] = {}
                     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)
             postinst = d.getVar('pkg_postinst_%s' % pkg)
             if not postinst: