classes/packagegroup: Refactor code to be simpler

This makes the code a bit shorter and more readable.

(From OE-Core rev: f092f99a0d7116ba4347b22f3f81b4eac4808e62)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ulf Magnusson 2016-04-01 10:53:31 +00:00 committed by Richard Purdie
parent 5defbcd92f
commit dea34232b8
1 changed files with 7 additions and 11 deletions

View File

@ -22,19 +22,15 @@ inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED', True) == 'all', 'al
# Also mark all packages as ALLOW_EMPTY
python () {
packages = d.getVar('PACKAGES', True).split()
for pkg in packages:
d.setVar("ALLOW_EMPTY_%s" % pkg, "1")
if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
# Add complementary packagegroups
genpackages = []
complementary_types = ['-dbg', '-dev']
types = ['', '-dbg', '-dev']
if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d):
complementary_types.append('-ptest')
for pkg in packages:
for postfix in complementary_types:
genpackages.append(pkg+postfix)
d.setVar("ALLOW_EMPTY_%s" % pkg+postfix, "1")
d.setVar('PACKAGES', ' '.join(packages+genpackages))
types.append('-ptest')
packages = [pkg + suffix for pkg in packages
for suffix in types]
d.setVar('PACKAGES', ' '.join(packages))
for pkg in packages:
d.setVar('ALLOW_EMPTY_%s' % pkg, '1')
}
# We don't want to look at shared library dependencies for the