From 52f9b12601c02f1585438f890f847b4596170362 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 21 Mar 2016 18:10:57 +1300 Subject: classes/packagegroup: drop complementary -ptest if ptest not in DISTRO_FEATURES If ptest isn't in DISTRO_FEATURES, there won't be any -ptest packages and thus no need for the -ptest package for the packagegroup either. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/packagegroup.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass index 92e0bbe9de..d56248f2de 100644 --- a/meta/classes/packagegroup.bbclass +++ b/meta/classes/packagegroup.bbclass @@ -27,8 +27,11 @@ python () { if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1': # Add complementary packagegroups genpackages = [] + complementary_types = ['-dbg', '-dev'] + if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d): + complementary_types.append('-ptest') for pkg in packages: - for postfix in ['-dbg', '-dev', '-ptest']: + for postfix in complementary_types: genpackages.append(pkg+postfix) d.setVar("ALLOW_EMPTY_%s" % pkg+postfix, "1") d.setVar('PACKAGES', ' '.join(packages+genpackages)) -- cgit 1.2.3-korg