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.

(From OE-Core rev: 52f9b12601c02f1585438f890f847b4596170362)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 92e0bbe9de32a4cc43a92268589165468e9bf771..d56248f2de199361df6f41dfe26c30a9040e4955 100644 (file)
--- 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))