[oe-commits] Martin Jansa : package.bbclass: show warning when package is trying to provide already provided shlib
git at git.openembedded.org
git at git.openembedded.org
Mon Sep 2 11:12:33 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 9ef7008b3238b6da5a3d5ee59553ca9c6d9ae77c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9ef7008b3238b6da5a3d5ee59553ca9c6d9ae77c
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Sun Jul 7 01:13:05 2013 +0200
package.bbclass: show warning when package is trying to provide already provided shlib
* 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 <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/package.bbclass | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e68dc1f..01ab5c7 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1347,6 +1347,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):
@@ -1462,6 +1463,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
@@ -1493,6 +1496,12 @@ 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 is already registered as shlib provider for %s, ignoring %s-%s trying to register the same' % (old_pkg, old_pkgver, s, pkg, pkgver))
+ continue
+ 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()
@@ -1507,8 +1516,6 @@ python package_do_shlibs() {
postinst += d.getVar('ldconfig_postinst_fragment', True)
d.setVar('pkg_postinst_%s' % pkg, postinst)
- read_shlib_providers()
-
bb.utils.unlockfile(lf)
assumed_libs = d.getVar('ASSUME_SHLIBS', True)
More information about the Openembedded-commits
mailing list