mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -11,15 +11,15 @@
|
||||
|
||||
python () {
|
||||
# Assume at least one var is set.
|
||||
distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split()
|
||||
distro_features = (d.getVar('DISTRO_FEATURES') or "").split()
|
||||
|
||||
any_of_distro_features = d.getVar('ANY_OF_DISTRO_FEATURES', True)
|
||||
any_of_distro_features = d.getVar('ANY_OF_DISTRO_FEATURES')
|
||||
if any_of_distro_features:
|
||||
any_of_distro_features = any_of_distro_features.split()
|
||||
if set.isdisjoint(set(any_of_distro_features),set(distro_features)):
|
||||
raise bb.parse.SkipPackage("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features)
|
||||
|
||||
required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES', True)
|
||||
required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES')
|
||||
if required_distro_features:
|
||||
required_distro_features = required_distro_features.split()
|
||||
for f in required_distro_features:
|
||||
@@ -28,7 +28,7 @@ python () {
|
||||
else:
|
||||
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')
|
||||
if conflict_distro_features:
|
||||
conflict_distro_features = conflict_distro_features.split()
|
||||
for f in conflict_distro_features:
|
||||
|
||||
Reference in New Issue
Block a user