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

package.bbclass: allow shell-style wildcards in PRIVATE_LIBS

Browse Source 
PRIVATE_LIBS is used to exclude 'private' libraries from getting added to
automatic runtime dependency resolution. This variable currently has to list
all libraries by name, which becomes a maintenance issue if the list
of such libraries frequently changes, or is very large.

This change allows using shell-style wildcards in the variable, similar
to how FILES lists what gets packaged.

(From OE-Core rev: 732db32714c208d8eeeb90308926dc886ef7b791)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-09-03 18:32:41 +02:00
committed by Richard Purdie
parent 4efd32b3ec
commit fe029a11bc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/package.bbclass
View File

@@ -1646,7 +1646,8 @@ python package_do_shlibs() {
prov = (this_soname, ldir, pkgver) prov = (this_soname, ldir, pkgver)
if not prov in sonames: if not prov in sonames:
# if library is private (only used by package) then do not build shlib for it # if library is private (only used by package) then do not build shlib for it
if not private_libs or this_soname not in private_libs: import fnmatch
if not private_libs or len([i for i in private_libs if fnmatch.fnmatch(this_soname, i)]) == 0:
sonames.add(prov) sonames.add(prov)
if libdir_re.match(os.path.dirname(file)): if libdir_re.match(os.path.dirname(file)):
needs_ldconfig = True needs_ldconfig = True
@@ -1829,7 +1830,8 @@ python package_do_shlibs() {
# /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1 # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1
# but skipping it is still better alternative than providing own # but skipping it is still better alternative than providing own
# version and then adding runtime dependency for the same system library # version and then adding runtime dependency for the same system library
if private_libs and n[0] in private_libs: import fnmatch
if private_libs and len([i for i in private_libs if fnmatch.fnmatch(n[0], i)]) > 0:
bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0]))
continue continue
if n[0] in shlib_provider.keys(): if n[0] in shlib_provider.keys():