diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-03-21 18:10:56 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-23 14:24:24 +0000 |
| commit | 340e9d619c881f320070474d5c4674dcaeabad35 (patch) | |
| tree | 9d61d8ee5c17401a0b4e19f5b46f319f7a235a95 | |
| parent | 34e7292fb40635cee1f1237ac3156530f8dfce37 (diff) | |
| download | openembedded-core-340e9d619c881f320070474d5c4674dcaeabad35.tar.gz openembedded-core-340e9d619c881f320070474d5c4674dcaeabad35.tar.bz2 openembedded-core-340e9d619c881f320070474d5c4674dcaeabad35.zip | |
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.
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.bbclass | 9 |
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)) } |