summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-03-21 18:10:57 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-25 10:29:13 +0000
commit0ec30c7a68f2d3dd9650e44af9e4268f83ec0281 (patch)
tree025a79aa8fe4e3bd3d2bf85dfda391d8ae3a2544
parentd96ea299b3b5a44b195927dd533898d6fedd91dc (diff)
downloadpoky-0ec30c7a68f2d3dd9650e44af9e4268f83ec0281.tar.gz
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>
-rw-r--r--meta/classes/packagegroup.bbclass5
1 files changed, 4 insertions, 1 deletions
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 () {
27 if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1': 27 if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
28 # Add complementary packagegroups 28 # Add complementary packagegroups
29 genpackages = [] 29 genpackages = []
30 complementary_types = ['-dbg', '-dev']
31 if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d):
32 complementary_types.append('-ptest')
30 for pkg in packages: 33 for pkg in packages:
31 for postfix in ['-dbg', '-dev', '-ptest']: 34 for postfix in complementary_types:
32 genpackages.append(pkg+postfix) 35 genpackages.append(pkg+postfix)
33 d.setVar("ALLOW_EMPTY_%s" % pkg+postfix, "1") 36 d.setVar("ALLOW_EMPTY_%s" % pkg+postfix, "1")
34 d.setVar('PACKAGES', ' '.join(packages+genpackages)) 37 d.setVar('PACKAGES', ' '.join(packages+genpackages))