diff options
author | Sebastian Wiegand <sebastian.wiegand@gersys.de> | 2014-05-22 12:24:16 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-27 16:11:54 +0100 |
commit | e01c99ee4ac0dc7751b4e7a94103d3528ac970bf (patch) | |
tree | ca0406351a8bbf210814297a71c2a51e595f1f30 /meta/classes | |
parent | 0882d265d83bcf816c1513cf594cdd35a309af8c (diff) | |
download | poky-e01c99ee4ac0dc7751b4e7a94103d3528ac970bf.tar.gz |
distro_features_check.bbclass: fix searching whole list
Search whole list of REQUIRED_DISTRO_FEATURES.
Print only the missing/conflicting feature on error.
(From OE-Core rev: 4290e10c17aa5477bbd57023c35426c12fcc25cb)
Signed-off-by: Sebastian Wiegand <sebastian.wiegand@gersys.de>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 8a0ecb707e..1f1d6fba37 100644 --- a/meta/classes/distro_features_check.bbclass +++ b/meta/classes/distro_features_check.bbclass | |||
@@ -14,9 +14,9 @@ python () { | |||
14 | distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split() | 14 | distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split() |
15 | for f in required_distro_features: | 15 | for f in required_distro_features: |
16 | if f in distro_features: | 16 | if f in distro_features: |
17 | break | 17 | continue |
18 | else: | 18 | else: |
19 | raise bb.parse.SkipPackage("missing required distro feature %s (not in DISTRO_FEATURES)" % required_distro_features) | 19 | raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) |
20 | 20 | ||
21 | conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True) | 21 | conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True) |
22 | if conflict_distro_features: | 22 | if conflict_distro_features: |
@@ -24,5 +24,5 @@ python () { | |||
24 | distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split() | 24 | distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split() |
25 | for f in conflict_distro_features: | 25 | for f in conflict_distro_features: |
26 | if f in distro_features: | 26 | if f in distro_features: |
27 | raise bb.parse.SkipPackage("conflicting distro feature %s (in DISTRO_FEATURES)" % conflict_distro_features) | 27 | raise bb.parse.SkipPackage("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f) |
28 | } | 28 | } |