* move read_shlib_providers before registering package as provider and don't change provider if it already exists, show warning instead
[YOCTO #4628] Signed-off-by: Martin Jansa <[email protected]> --- meta/classes/package.bbclass | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7dcec5e..9b511a6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1356,6 +1356,7 @@ python package_do_shlibs() { list_re = re.compile('^(.*)\.list$') # Go from least to most specific since the last one found wins for dir in reversed(shlibs_dirs): + bb.debug(2, "Reading shlib providers in %s" % (dir)) if not os.path.exists(dir): continue for file in os.listdir(dir): @@ -1471,6 +1472,8 @@ python package_do_shlibs() { needed = {} shlib_provider = {} + read_shlib_providers() + for pkg in packages.split(): private_libs = d.getVar('PRIVATE_LIBS_' + pkg, True) or d.getVar('PRIVATE_LIBS', True) needs_ldconfig = False @@ -1504,6 +1507,11 @@ python package_do_shlibs() { if len(sonames): fd = open(shlibs_file, 'w') for s in sonames: + if s in shlib_provider: + (old_pkg, old_pkgver) = shlib_provider[s] + if old_pkg != pkg: + bb.warn('%s-%s was registered as shlib provider for %s, changing it to %s-%s because it was built later' % (old_pkg, old_pkgver, s, pkg, pkgver)) + bb.debug(1, 'registering %s-%s as shlib provider for %s' % (pkg, pkgver, s)) fd.write(s + '\n') shlib_provider[s] = (pkg, pkgver) fd.close() @@ -1517,8 +1525,7 @@ python package_do_shlibs() { postinst = '#!/bin/sh\n' postinst += d.getVar('ldconfig_postinst_fragment', True) d.setVar('pkg_postinst_%s' % pkg, postinst) - - read_shlib_providers() + bb.debug(1, 'LIBNAMES: pkg %s sonames %s' % (pkg, sonames)) bb.utils.unlockfile(lf) -- 1.8.5.2 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
