]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
package.bbclass: Always include ldconfig fragment
authorAndreas Oberritter <obi@opendreambox.org>
Mon, 18 Mar 2019 21:05:15 +0000 (22:05 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Mon, 8 Apr 2019 11:49:57 +0000 (13:49 +0200)
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>
meta/classes/package.bbclass

index f3cbe2452c2171fc760c68c2c248a91a4fe29174..3ee8da18fb9463c7d1949c823e2f93168952b939 100644 (file)
@@ -1647,8 +1647,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)
 
@@ -1697,7 +1695,7 @@ python package_do_shlibs() {
                     shlib_provider[s[0]] = {}
                 shlib_provider[s[0]][s[1]] = (pkg, pkgver)
             fd.close()
-        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: