mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

distro_features_check.bbclass: fix searching whole list

Browse Source 
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>
This commit is contained in:
Sebastian Wiegand
2014-05-22 12:24:16 +02:00
committed by Richard Purdie
parent 0882d265d8
commit e01c99ee4a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/distro_features_check.bbclass
+3 -3
View File
@@ -14,9 +14,9 @@ python () {
distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split() distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split()
for f in required_distro_features: for f in required_distro_features:
if f in distro_features: if f in distro_features:
break continue
else: else:
raise bb.parse.SkipPackage("missing required distro feature %s (not in DISTRO_FEATURES)" % required_distro_features) raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f)
conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True) conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True)
if conflict_distro_features: if conflict_distro_features:
@@ -24,5 +24,5 @@ python () {
distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split() distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split()
for f in conflict_distro_features: for f in conflict_distro_features:
if f in distro_features: if f in distro_features:
raise bb.parse.SkipPackage("conflicting distro feature %s (in DISTRO_FEATURES)" % conflict_distro_features) raise bb.parse.SkipPackage("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f)
} }