diff options
Diffstat (limited to 'poky/meta/lib/oe/packagegroup.py')
-rw-r--r-- | poky/meta/lib/oe/packagegroup.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/poky/meta/lib/oe/packagegroup.py b/poky/meta/lib/oe/packagegroup.py index 8fcaecde82..2419cbb6d3 100644 --- a/poky/meta/lib/oe/packagegroup.py +++ b/poky/meta/lib/oe/packagegroup.py @@ -5,11 +5,17 @@ import itertools def is_optional(feature, d): - return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional")) + packages = d.getVar("FEATURE_PACKAGES_%s" % feature) + if packages: + return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional")) + else: + return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional")) def packages(features, d): for feature in features: packages = d.getVar("FEATURE_PACKAGES_%s" % feature) + if not packages: + packages = d.getVar("PACKAGE_GROUP_%s" % feature) for pkg in (packages or "").split(): yield pkg |