diff options
Diffstat (limited to 'meta/classes/distro_features_check.bbclass')
| -rw-r--r-- | meta/classes/distro_features_check.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/distro_features_check.bbclass b/meta/classes/distro_features_check.bbclass index 7e91dbcf4a..e74d3c04ba 100644 --- a/meta/classes/distro_features_check.bbclass +++ b/meta/classes/distro_features_check.bbclass | |||
| @@ -11,15 +11,15 @@ | |||
| 11 | 11 | ||
| 12 | python () { | 12 | python () { |
| 13 | # Assume at least one var is set. | 13 | # Assume at least one var is set. |
| 14 | distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split() | 14 | distro_features = (d.getVar('DISTRO_FEATURES') or "").split() |
| 15 | 15 | ||
| 16 | any_of_distro_features = d.getVar('ANY_OF_DISTRO_FEATURES', True) | 16 | any_of_distro_features = d.getVar('ANY_OF_DISTRO_FEATURES') |
| 17 | if any_of_distro_features: | 17 | if any_of_distro_features: |
| 18 | any_of_distro_features = any_of_distro_features.split() | 18 | any_of_distro_features = any_of_distro_features.split() |
| 19 | if set.isdisjoint(set(any_of_distro_features),set(distro_features)): | 19 | if set.isdisjoint(set(any_of_distro_features),set(distro_features)): |
| 20 | raise bb.parse.SkipPackage("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) | 20 | raise bb.parse.SkipPackage("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) |
| 21 | 21 | ||
| 22 | required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES', True) | 22 | required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES') |
| 23 | if required_distro_features: | 23 | if required_distro_features: |
| 24 | required_distro_features = required_distro_features.split() | 24 | required_distro_features = required_distro_features.split() |
| 25 | for f in required_distro_features: | 25 | for f in required_distro_features: |
| @@ -28,7 +28,7 @@ python () { | |||
| 28 | else: | 28 | else: |
| 29 | raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) | 29 | raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) |
| 30 | 30 | ||
| 31 | conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True) | 31 | conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES') |
| 32 | if conflict_distro_features: | 32 | if conflict_distro_features: |
| 33 | conflict_distro_features = conflict_distro_features.split() | 33 | conflict_distro_features = conflict_distro_features.split() |
| 34 | for f in conflict_distro_features: | 34 | for f in conflict_distro_features: |
