diff options
Diffstat (limited to 'meta/classes/distro_features_check.bbclass')
-rw-r--r-- | meta/classes/distro_features_check.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/distro_features_check.bbclass b/meta/classes/distro_features_check.bbclass index e74d3c04ba..9b78b03ef6 100644 --- a/meta/classes/distro_features_check.bbclass +++ b/meta/classes/distro_features_check.bbclass | |||
@@ -17,7 +17,7 @@ python () { | |||
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.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) |
21 | 21 | ||
22 | required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES') | 22 | required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES') |
23 | if required_distro_features: | 23 | if required_distro_features: |
@@ -26,12 +26,12 @@ python () { | |||
26 | if f in distro_features: | 26 | if f in distro_features: |
27 | continue | 27 | continue |
28 | else: | 28 | else: |
29 | raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) | 29 | raise bb.parse.SkipRecipe("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) |
30 | 30 | ||
31 | conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES') | 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: |
35 | if f in distro_features: | 35 | if f in distro_features: |
36 | raise bb.parse.SkipPackage("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f) | 36 | raise bb.parse.SkipRecipe("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f) |
37 | } | 37 | } |