distro_features_check: expand with IMAGE_FEATURES

In addition to checking DISTRO_, MACHINE_, and COMBINED_ FEATURES for required
or conflicting features, extend this functionality in order to check
IMAGE_FEATURES in the same way.

(From OE-Core rev: 96a9702a24a73c152c8e7398c3774e63c53a92a9)

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Trevor Woerner
2021-08-30 22:50:33 -04:00
committed by Richard Purdie
parent 157462fc2a
commit d7140d5375

View File

@@ -1,6 +1,6 @@
# Allow checking of required and conflicting features
#
# xxx = [DISTRO,MACHINE,COMBINED]
# xxx = [DISTRO,MACHINE,COMBINED,IMAGE]
#
# ANY_OF_xxx_FEATURES: ensure at least one item on this list is included
# in xxx_FEATURES.
@@ -18,7 +18,7 @@ python () {
unused = True
for kind in ['DISTRO', 'MACHINE', 'COMBINED']:
for kind in ['DISTRO', 'MACHINE', 'COMBINED', 'IMAGE']:
if d.getVar('ANY_OF_' + kind + '_FEATURES') is None and \
d.overridedata.get('ANY_OF_' + kind + '_FEATURES') is None and \
d.getVar('REQUIRED_' + kind + '_FEATURES') is None and \