aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2019-03-18 22:05:15 +0100
committerAndreas Oberritter <obi@opendreambox.org>2019-04-08 13:49:57 +0200
commita6752fe94064a501537172823d4913eb9121391f (patch)
treea4eb8326a7031b443598fd5862700efc9bfd1671
parent7d7f63865c4dfffdcb132cf0dc9dc89a4c0b5b9c (diff)
downloadopenembedded-core-contrib-a6752fe94064a501537172823d4913eb9121391f.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 f3cbe2452c..3ee8da18fb 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: