bitbake: cache/ast: Move __VARIANTS handling to parse cache function
Simple refactoring to allow for multiconfig support. (Bitbake rev: 266b848da40904446eb1d084bbdc5307a9b45197) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0ef16f083e
commit
4cd5647f12
|
@ -401,14 +401,18 @@ class Cache(object):
|
||||||
infos = []
|
infos = []
|
||||||
datastores = cls.load_bbfile(filename, appends, configdata)
|
datastores = cls.load_bbfile(filename, appends, configdata)
|
||||||
depends = []
|
depends = []
|
||||||
|
variants = []
|
||||||
|
# Process the "real" fn last so we can store variants list
|
||||||
for variant, data in sorted(datastores.items(),
|
for variant, data in sorted(datastores.items(),
|
||||||
key=lambda i: i[0],
|
key=lambda i: i[0],
|
||||||
reverse=True):
|
reverse=True):
|
||||||
virtualfn = cls.realfn2virtual(filename, variant)
|
virtualfn = cls.realfn2virtual(filename, variant)
|
||||||
|
variants.append(variant)
|
||||||
depends = depends + (data.getVar("__depends", False) or [])
|
depends = depends + (data.getVar("__depends", False) or [])
|
||||||
if depends and not variant:
|
if depends and not variant:
|
||||||
data.setVar("__depends", depends)
|
data.setVar("__depends", depends)
|
||||||
|
if virtualfn == filename:
|
||||||
|
data.setVar("__VARIANTS", " ".join(variants))
|
||||||
info_array = []
|
info_array = []
|
||||||
for cache_class in caches_array:
|
for cache_class in caches_array:
|
||||||
info = cache_class(filename, data)
|
info = cache_class(filename, data)
|
||||||
|
|
|
@ -469,9 +469,5 @@ def multi_finalize(fn, d):
|
||||||
except bb.parse.SkipRecipe as e:
|
except bb.parse.SkipRecipe as e:
|
||||||
datastores[variant].setVar("__SKIPPED", e.args[0])
|
datastores[variant].setVar("__SKIPPED", e.args[0])
|
||||||
|
|
||||||
if len(datastores) > 1:
|
|
||||||
variants = filter(None, datastores.keys())
|
|
||||||
safe_d.setVar("__VARIANTS", " ".join(variants))
|
|
||||||
|
|
||||||
datastores[""] = d
|
datastores[""] = d
|
||||||
return datastores
|
return datastores
|
||||||
|
|
Loading…
Reference in New Issue