[oe-commits] [openembedded-core] 03/04: package.bbclass: Always include ldconfig fragment

git at git.openembedded.org git at git.openembedded.org
Mon Nov 11 14:14:33 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 0f09f19dc48edf2ac50b554c18c217b7f97d4ae3
Author: Andreas Oberritter <obi at opendreambox.org>
AuthorDate: Thu Nov 7 21:49:42 2019 +0100

    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 at opendreambox.org>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package.bbclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index f955df1..e0d6ff6 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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list