summaryrefslogtreecommitdiffstats
path: root/meta/classes/features_check.bbclass
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2021-08-31 02:50:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-01 13:06:18 (GMT)
commitd7140d537528218ef082a90c645a48107dcbfbc0 (patch)
tree62b225afe7e19b0a54b64bbb465b40e19e366420 /meta/classes/features_check.bbclass
parent157462fc2a5b086ec154a65f91512d340c1e83d5 (diff)
downloadpoky-d7140d537528218ef082a90c645a48107dcbfbc0.tar.gz
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>
Diffstat (limited to 'meta/classes/features_check.bbclass')
-rw-r--r--meta/classes/features_check.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/features_check.bbclass b/meta/classes/features_check.bbclass
index b3c8047..205e1b9 100644
--- a/meta/classes/features_check.bbclass
+++ b/meta/classes/features_check.bbclass
@@ -1,6 +1,6 @@
1# Allow checking of required and conflicting features 1# Allow checking of required and conflicting features
2# 2#
3# xxx = [DISTRO,MACHINE,COMBINED] 3# xxx = [DISTRO,MACHINE,COMBINED,IMAGE]
4# 4#
5# ANY_OF_xxx_FEATURES: ensure at least one item on this list is included 5# ANY_OF_xxx_FEATURES: ensure at least one item on this list is included
6# in xxx_FEATURES. 6# in xxx_FEATURES.
@@ -18,7 +18,7 @@ python () {
18 18
19 unused = True 19 unused = True
20 20
21 for kind in ['DISTRO', 'MACHINE', 'COMBINED']: 21 for kind in ['DISTRO', 'MACHINE', 'COMBINED', 'IMAGE']:
22 if d.getVar('ANY_OF_' + kind + '_FEATURES') is None and \ 22 if d.getVar('ANY_OF_' + kind + '_FEATURES') is None and \
23 d.overridedata.get('ANY_OF_' + kind + '_FEATURES') is None and \ 23 d.overridedata.get('ANY_OF_' + kind + '_FEATURES') is None and \
24 d.getVar('REQUIRED_' + kind + '_FEATURES') is None and \ 24 d.getVar('REQUIRED_' + kind + '_FEATURES') is None and \