diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/features_check.bbclass | 9 | ||||
-rw-r--r-- | meta/classes/insane.bbclass | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/meta/classes/features_check.bbclass b/meta/classes/features_check.bbclass index 205e1b9cd3..3ef6b35baa 100644 --- a/meta/classes/features_check.bbclass +++ b/meta/classes/features_check.bbclass | |||
@@ -19,12 +19,9 @@ python () { | |||
19 | unused = True | 19 | unused = True |
20 | 20 | ||
21 | for kind in ['DISTRO', 'MACHINE', 'COMBINED', 'IMAGE']: | 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 not d.hasOverrides('ANY_OF_' + kind + '_FEATURES') and \ |
23 | d.overridedata.get('ANY_OF_' + kind + '_FEATURES') is None and \ | 23 | d.getVar('REQUIRED_' + kind + '_FEATURES') is None and not d.hasOverrides('REQUIRED_' + kind + '_FEATURES') and \ |
24 | d.getVar('REQUIRED_' + kind + '_FEATURES') is None and \ | 24 | d.getVar('CONFLICT_' + kind + '_FEATURES') is None and not d.hasOverrides('CONFLICT_' + kind + '_FEATURES'): |
25 | d.overridedata.get('REQUIRED_' + kind + '_FEATURES') is None and \ | ||
26 | d.getVar('CONFLICT_' + kind + '_FEATURES') is None and \ | ||
27 | d.overridedata.get('CONFLICT_' + kind + '_FEATURES') is None: | ||
28 | continue | 25 | continue |
29 | 26 | ||
30 | unused = False | 27 | unused = False |
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index a13a947bcf..a28fcd4798 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -992,7 +992,7 @@ def package_qa_check_unhandled_features_check(pn, d, messages): | |||
992 | var_set = False | 992 | var_set = False |
993 | for kind in ['DISTRO', 'MACHINE', 'COMBINED']: | 993 | for kind in ['DISTRO', 'MACHINE', 'COMBINED']: |
994 | for var in ['ANY_OF_' + kind + '_FEATURES', 'REQUIRED_' + kind + '_FEATURES', 'CONFLICT_' + kind + '_FEATURES']: | 994 | for var in ['ANY_OF_' + kind + '_FEATURES', 'REQUIRED_' + kind + '_FEATURES', 'CONFLICT_' + kind + '_FEATURES']: |
995 | if d.getVar(var) is not None or d.overridedata.get(var) is not None: | 995 | if d.getVar(var) is not None or d.hasOverrides(var): |
996 | var_set = True | 996 | var_set = True |
997 | if var_set: | 997 | if var_set: |
998 | oe.qa.handle_error("unhandled-features-check", "%s: recipe doesn't inherit features_check" % pn, d) | 998 | oe.qa.handle_error("unhandled-features-check", "%s: recipe doesn't inherit features_check" % pn, d) |