diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2019-11-07 21:49:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-11 14:07:08 +0000 |
commit | fcd86247ff298edb9c35772fd77a9539a7caef47 (patch) | |
tree | a4d54f77c070205ca639e04854c9453940359846 | |
parent | 27c0553e7098f19316d6655413bc03b53a86a87b (diff) | |
download | poky-fcd86247ff298edb9c35772fd77a9539a7caef47.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.
(From OE-Core rev: 0f09f19dc48edf2ac50b554c18c217b7f97d4ae3)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/package.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
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() { | |||
1731 | else: | 1731 | else: |
1732 | snap_symlinks = False | 1732 | snap_symlinks = False |
1733 | 1733 | ||
1734 | use_ldconfig = bb.utils.contains('DISTRO_FEATURES', 'ldconfig', True, False, d) | ||
1735 | |||
1736 | needed = {} | 1734 | needed = {} |
1737 | 1735 | ||
1738 | shlib_provider = oe.package.read_shlib_providers(d) | 1736 | shlib_provider = oe.package.read_shlib_providers(d) |
@@ -1791,7 +1789,7 @@ python package_do_shlibs() { | |||
1791 | if s[0] not in shlib_provider: | 1789 | if s[0] not in shlib_provider: |
1792 | shlib_provider[s[0]] = {} | 1790 | shlib_provider[s[0]] = {} |
1793 | shlib_provider[s[0]][s[1]] = (pkg, pkgver) | 1791 | shlib_provider[s[0]][s[1]] = (pkg, pkgver) |
1794 | if needs_ldconfig and use_ldconfig: | 1792 | if needs_ldconfig: |
1795 | bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) | 1793 | bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) |
1796 | postinst = d.getVar('pkg_postinst_%s' % pkg) | 1794 | postinst = d.getVar('pkg_postinst_%s' % pkg) |
1797 | if not postinst: | 1795 | if not postinst: |