Skip to contentSkip to conversation

distro_features_check: expand with IMAGE_FEATURES

PATCH New Trevor Woerner 1 participant 1 message Aug 31, 2021

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
changes in v2:
- update in-file documentation

---
 meta/classes/features_check.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/features_check.bbclass +2 -2
index b3c8047861..205e1b9cd3 100644
@@ -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 \
Signature · 1 line
2.30.0.rc0