[oe-commits] [openembedded-core] 02/69: classes/packagegroup: drop complementary -ptest if ptest not in DISTRO_FEATURES

git at git.openembedded.org git at git.openembedded.org
Wed Mar 23 14:25:50 UTC 2016


rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 52f9b12601c02f1585438f890f847b4596170362
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Mon Mar 21 18:10:57 2016 +1300

    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.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/packagegroup.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 92e0bbe..d56248f 100644
--- 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))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list