summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2019-11-07 21:49:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-11 14:07:00 +0000
commit0f09f19dc48edf2ac50b554c18c217b7f97d4ae3 (patch)
treeec1f9029e38e6d85a3ae35753fed1130cdcca798 /meta/classes/package.bbclass
parentfda7cd9328ba26e0023d7ddfaa23f73b59443a08 (diff)
downloadopenembedded-core-contrib-0f09f19dc48edf2ac50b554c18c217b7f97d4ae3.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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-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 f955df11118..e0d6ff67018 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: