1 files changed, 6 insertions, 3 deletions

diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 56cfead82a..92e0bbe9de 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -22,12 +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()
-    genpackages = []
     for pkg in packages:
         d.setVar("ALLOW_EMPTY_%s" % pkg, "1")
-        for postfix in ['-dbg', '-dev', '-ptest']:
-            genpackages.append(pkg+postfix)
     if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
+        # Add complementary packagegroups
+        genpackages = []
+        for pkg in packages:
+            for postfix in ['-dbg', '-dev', '-ptest']:
+                genpackages.append(pkg+postfix)
+                d.setVar("ALLOW_EMPTY_%s" % pkg+postfix, "1")
         d.setVar('PACKAGES', ' '.join(packages+genpackages))
 }