utils: add -src to system package name blacklist
PATCH 1/2 utils: add -src to system package name blacklist
oe.utils.packages_filter_out_system() returns PACKAGES after removing "system" packages but it doesn't handle ${PN}-src as generated by PACKAGE_DEBUG_SPLIT_STYLE=debug-with-srcpkg.
Signed-off-by Ross Burton <[email protected]>
--- meta/lib/oe/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/utils.py +1 -1
@@ -214,7 +214,7 @@ def packages_filter_out_system(d): PN-dbg PN-doc PN-locale-eb-gb removed. """ pn = d.getVar('PN') - blacklist = [pn + suffix for suffix in ('', '-dbg', '-dev', '-doc', '-locale', '-staticdev')] + blacklist = [pn + suffix for suffix in ('', '-dbg', '-dev', '-doc', '-locale', '-staticdev', '-src')] localepkg = pn + "-locale-" pkgs = []
Signature · 1 line
2.11.0
PATCH 2/2 gstreamer: improve metadata dependencies
Instead of maintaining its own copy of the 'system' packages, reuse oe.utils.packages_filter_out_system().
This stops ${PN}-src being added to the meta package, which meant anything depending on the meta package was also pulling in the sources.
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-multimedia/gstreamer/gst-plugins-package.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-multimedia/gstreamer/gst-plugins-package.inc +4 -4
@@ -15,17 +15,17 @@ python split_gstreamer10_packages () { python set_metapkg_rdepends () { import os + import oe.utils pn = d.getVar('PN') metapkg = pn + '-meta' d.setVar('ALLOW_EMPTY_' + metapkg, "1") d.setVar('FILES_' + metapkg, "") - blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + '-meta' ] + blacklist = [ pn, pn + '-meta' ] metapkg_rdepends = [] - packages = d.getVar('PACKAGES').split() pkgdest = d.getVar('PKGDEST') - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-staticdev'): + for pkg in oe.utils.packages_filter_out_system(d): + if pkg not in blacklist and pkg not in metapkg_rdepends: # See if the package is empty by looking at the contents of its PKGDEST subdirectory. # If this subdirectory is empty, then the package is. # Empty packages do not get added to the meta package's RDEPENDS
Signature · 1 line
2.11.0