diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-12-19 11:41:44 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-21 12:37:18 +0000 |
| commit | 657cff8a0f0e5db171b2ed9388a790ee0b135842 (patch) | |
| tree | 9cf2ce43757a1deaaf1cd30b2ab22afe326670ff | |
| parent | e9a211321b4570282d0d65a0bb519e05a3d477bb (diff) | |
| download | openembedded-core-contrib-657cff8a0f0e5db171b2ed9388a790ee0b135842.tar.gz | |
classes/package: move read_shlib_providers() to a common unit
This allows us to use this function elsewhere in the code.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package.bbclass | 24 | ||||
| -rw-r--r-- | meta/lib/oe/package.py | 26 |
2 files changed, 27 insertions, 23 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index dc4025d3279..fc501fcdea0 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1391,32 +1391,11 @@ python package_do_shlibs() { pkgdest = d.getVar('PKGDEST', True) - shlibs_dirs = d.getVar('SHLIBSDIRS', True).split() shlibswork_dir = d.getVar('SHLIBSWORKDIR', True) # Take shared lock since we're only reading, not writing lf = bb.utils.lockfile(d.expand("${PACKAGELOCK}")) - def read_shlib_providers(): - 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): - m = list_re.match(file) - if m: - dep_pkg = m.group(1) - fd = open(os.path.join(dir, file)) - lines = fd.readlines() - fd.close() - for l in lines: - s = l.strip().split(":") - if s[0] not in shlib_provider: - shlib_provider[s[0]] = {} - shlib_provider[s[0]][s[1]] = (dep_pkg, s[2]) - def linux_so(file, needed, sonames, renames, pkgver): needs_ldconfig = False ldir = os.path.dirname(file).replace(pkgdest + "/" + pkg, '') @@ -1513,8 +1492,7 @@ python package_do_shlibs() { use_ldconfig = False needed = {} - shlib_provider = {} - read_shlib_providers() + shlib_provider = oe.package.read_shlib_providers(d) for pkg in packages.split(): private_libs = d.getVar('PRIVATE_LIBS_' + pkg, True) or d.getVar('PRIVATE_LIBS', True) or "" diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index f8b532220a1..ea6feaaea4f 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -97,3 +97,29 @@ def filedeprunner(arg): raise e return (pkg, provides, requires) + + +def read_shlib_providers(d): + import re + + shlib_provider = {} + shlibs_dirs = d.getVar('SHLIBSDIRS', True).split() + 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): + m = list_re.match(file) + if m: + dep_pkg = m.group(1) + fd = open(os.path.join(dir, file)) + lines = fd.readlines() + fd.close() + for l in lines: + s = l.strip().split(":") + if s[0] not in shlib_provider: + shlib_provider[s[0]] = {} + shlib_provider[s[0]][s[1]] = (dep_pkg, s[2]) + return shlib_provider |