From: Andreas Oberritter <obi@opendreambox.org>
Date: Thu, 7 Nov 2019 20:49:42 +0000 (+0100)
Subject: package.bbclass: Always include ldconfig fragment
X-Git-Tag: uninative-2.8~1139
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0f09f19dc48edf2ac50b554c18c217b7f97d4ae3;p=openembedded-core.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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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