CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

features_check/insane: Use hasOverrides datastore method

Browse Source 
(From OE-Core rev: 401c56258753a96c0a4e3e91a11518f182d410ff)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2022-02-15 23:09:43 +00:00
parent cb0ed5a97c
commit a5280f7e30
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/classes/features_check.bbclass
View File

@ -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

2
meta/classes/insane.bbclass
View File

@ -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)