From 96a9702a24a73c152c8e7398c3774e63c53a92a9 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Mon, 30 Aug 2021 22:50:33 -0400 Subject: [PATCH] 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. Signed-off-by: Trevor Woerner Signed-off-by: Richard Purdie --- meta/classes/features_check.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/features_check.bbclass b/meta/classes/features_check.bbclass index b3c8047861..205e1b9cd3 100644 --- a/meta/classes/features_check.bbclass +++ b/meta/classes/features_check.bbclass @@ -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 \ -- 2.40.1