From: Andreas Oberritter <obi@opendreambox.org>
Date: Mon, 18 Mar 2019 21:05:15 +0000 (+0100)
Subject: package.bbclass: Always include ldconfig fragment
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6752fe94064a501537172823d4913eb9121391f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

package.bbclass: Always include ldconfig fragment

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>
---

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index f3cbe2452c2..3ee8da18fb9 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -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: