mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

package.bbclass: show warning when package is providing already provided shlib

Browse Source 
* move read_shlib_providers before registering package as provider
  and show warning when different package tries to provide something
  already provided.

[YOCTO #4628]

(From OE-Core rev: 8141e3f61f12c8901b990496bcf6b76a9db95a57)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2014-01-19 16:24:19 +01:00
committed by Richard Purdie
parent bd938fe510
commit 1180ec37e4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meta/classes/package.bbclass
View File

@@ -1356,6 +1356,7 @@ python package_do_shlibs() {
list_re = re.compile('^(.*)\.list$') list_re = re.compile('^(.*)\.list$')
# Go from least to most specific since the last one found wins # Go from least to most specific since the last one found wins
for dir in reversed(shlibs_dirs): for dir in reversed(shlibs_dirs):
bb.debug(2, "Reading shlib providers in %s" % (dir))
if not os.path.exists(dir): if not os.path.exists(dir):
continue continue
for file in os.listdir(dir): for file in os.listdir(dir):
@@ -1471,6 +1472,8 @@ python package_do_shlibs() {
needed = {} needed = {}
shlib_provider = {} shlib_provider = {}
read_shlib_providers()
for pkg in packages.split(): for pkg in packages.split():
private_libs = d.getVar('PRIVATE_LIBS_' + pkg, True) or d.getVar('PRIVATE_LIBS', True) private_libs = d.getVar('PRIVATE_LIBS_' + pkg, True) or d.getVar('PRIVATE_LIBS', True)
needs_ldconfig = False needs_ldconfig = False
@@ -1504,6 +1507,11 @@ python package_do_shlibs() {
if len(sonames): if len(sonames):
fd = open(shlibs_file, 'w') fd = open(shlibs_file, 'w')
for s in sonames: 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') fd.write(s + '\n')
shlib_provider[s] = (pkg, pkgver) shlib_provider[s] = (pkg, pkgver)
fd.close() fd.close()
@@ -1517,8 +1525,7 @@ python package_do_shlibs() {
postinst = '#!/bin/sh\n' postinst = '#!/bin/sh\n'
postinst += d.getVar('ldconfig_postinst_fragment', True) postinst += d.getVar('ldconfig_postinst_fragment', True)
d.setVar('pkg_postinst_%s' % pkg, postinst) d.setVar('pkg_postinst_%s' % pkg, postinst)
bb.debug(1, 'LIBNAMES: pkg %s sonames %s' % (pkg, sonames))
read_shlib_providers()
bb.utils.unlockfile(lf) bb.utils.unlockfile(lf)