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