diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-15 23:09:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-17 17:48:10 +0000 |
| commit | 401c56258753a96c0a4e3e91a11518f182d410ff (patch) | |
| tree | 4c6b6dfe72591da742b052fed13cfaad551b17d3 /meta | |
| parent | 753645155b402c899080349bc741361480c4abe8 (diff) | |
| download | openembedded-core-contrib-401c56258753a96c0a4e3e91a11518f182d410ff.tar.gz | |
features_check/insane: Use hasOverrides datastore method
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 () { unused = True 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 \ - d.overridedata.get('REQUIRED_' + kind + '_FEATURES') is None and \ - d.getVar('CONFLICT_' + kind + '_FEATURES') is None and \ - d.overridedata.get('CONFLICT_' + kind + '_FEATURES') is None: + if d.getVar('ANY_OF_' + kind + '_FEATURES') is None and not d.hasOverrides('ANY_OF_' + kind + '_FEATURES') and \ + d.getVar('REQUIRED_' + kind + '_FEATURES') is None and not d.hasOverrides('REQUIRED_' + kind + '_FEATURES') and \ + d.getVar('CONFLICT_' + kind + '_FEATURES') is None and not d.hasOverrides('CONFLICT_' + kind + '_FEATURES'): continue 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): var_set = False for kind in ['DISTRO', 'MACHINE', 'COMBINED']: for var in ['ANY_OF_' + kind + '_FEATURES', 'REQUIRED_' + kind + '_FEATURES', 'CONFLICT_' + kind + '_FEATURES']: - if d.getVar(var) is not None or d.overridedata.get(var) is not None: + if d.getVar(var) is not None or d.hasOverrides(var): var_set = True if var_set: oe.qa.handle_error("unhandled-features-check", "%s: recipe doesn't inherit features_check" % pn, d) |