diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-05-26 20:25:03 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-05-26 20:25:03 +0300 |
| commit | 35a774200999ac2fca48693c1c169bf99d2f63ea (patch) | |
| tree | 0b2f65ce3a90f41d1c2542d0fd20b1604fd83fe5 /poky/meta/lib/oe | |
| parent | 497a23ef6661ad6ca7b75009e48a592c1620d46c (diff) | |
| download | openbmc-35a774200999ac2fca48693c1c169bf99d2f63ea.tar.xz | |
Reset the following subtrees on HEAD:
poky: ed3bdd7fbc(dunfell)
meta-raspberrypi: 8066fac91d(dunfell)
meta-security: d83f7cb0c9(dunfell)
meta-openembedded: e413c1ef62(dunfell)
Change-Id: Ifd3228663b08911c890d7631310294cccb3dd232
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/lib/oe')
| -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 |