diff options
Diffstat (limited to 'meta/classes/features_check.bbclass')
| -rw-r--r-- | meta/classes/features_check.bbclass | 9 |
1 files changed, 3 insertions, 6 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 |