summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-03-21 18:10:56 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-25 10:29:13 +0000
commitd96ea299b3b5a44b195927dd533898d6fedd91dc (patch)
tree5046264050869ae9e9da9c973a9d2fe143f67397
parentb58e5b1fb3bcacbcfce17a748bca5f60c3528b4f (diff)
downloadpoky-d96ea299b3b5a44b195927dd533898d6fedd91dc.tar.gz
classes/packagegroup: fix dbg/dev/ptest complementary packages
OE-Core commit 8981ed20234c42dc1f5cdef802ebe7214bd55238 (from 2013) caused a regression where -dbg/-dev/-ptest packages weren't generated for packagegroups because we weren't setting ALLOW_EMPTY for them. Break out the code for adding complementary groups to its own conditional so we can set ALLOW_EMPTY at the same time. (From OE-Core rev: 340e9d619c881f320070474d5c4674dcaeabad35) 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.bbclass9
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
22# Also mark all packages as ALLOW_EMPTY 22# Also mark all packages as ALLOW_EMPTY
23python () { 23python () {
24 packages = d.getVar('PACKAGES', True).split() 24 packages = d.getVar('PACKAGES', True).split()
25 genpackages = []
26 for pkg in packages: 25 for pkg in packages:
27 d.setVar("ALLOW_EMPTY_%s" % pkg, "1") 26 d.setVar("ALLOW_EMPTY_%s" % pkg, "1")
28 for postfix in ['-dbg', '-dev', '-ptest']:
29 genpackages.append(pkg+postfix)
30 if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1': 27 if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
28 # Add complementary packagegroups
29 genpackages = []
30 for pkg in packages:
31 for postfix in ['-dbg', '-dev', '-ptest']:
32 genpackages.append(pkg+postfix)
33 d.setVar("ALLOW_EMPTY_%s" % pkg+postfix, "1")
31 d.setVar('PACKAGES', ' '.join(packages+genpackages)) 34 d.setVar('PACKAGES', ' '.join(packages+genpackages))
32} 35}
33 36