summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2019-03-18 22:05:15 +0100
committerAndreas Oberritter <obi@opendreambox.org>2020-07-02 15:10:00 +0200
commitf37d7fae7f5134f24675d5b17bd7299f705aa7ee (patch)
tree697f44fa4af4241dbb8aa7ad53d0ef14ec8e8621
parentb109f5189d0eaa9346c2e3f5b7ba482782ac9d98 (diff)
downloadopenembedded-core-contrib-f37d7fae7f5134f24675d5b17bd7299f705aa7ee.tar.gz
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>
-rw-r--r--meta/classes/package.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 7f82e37c1b..1ac87d55ab 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1732,8 +1732,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)
@@ -1793,7 +1791,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: