diff options
| -rw-r--r-- | meta/classes/packagegroup.bbclass | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass index d56248f2de..38bdbd3822 100644 --- a/meta/classes/packagegroup.bbclass +++ b/meta/classes/packagegroup.bbclass @@ -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 |