[bitbake-devel] [PATCH] cache/ast: Move __VARIANTS handling to parse cache function
Richard Purdie
richard.purdie at linuxfoundation.org
Mon Aug 15 16:59:56 UTC 2016
Simple refactoring to allow for multiconfig support.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index c09f929..658f30f 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -401,14 +401,18 @@ class Cache(object):
infos = []
datastores = cls.load_bbfile(filename, appends, configdata)
depends = []
+ variants = []
+ # Process the "real" fn last so we can store variants list
for variant, data in sorted(datastores.items(),
key=lambda i: i[0],
reverse=True):
virtualfn = cls.realfn2virtual(filename, variant)
+ variants.append(variant)
depends = depends + (data.getVar("__depends", False) or [])
if depends and not variant:
data.setVar("__depends", depends)
-
+ if virtualfn == filename:
+ data.setVar("__VARIANTS", " ".join(variants))
info_array = []
for cache_class in caches_array:
info = cache_class(filename, data)
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index b407b09..d7185b1 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -502,9 +502,5 @@ def multi_finalize(fn, d):
except bb.parse.SkipRecipe as e:
datastores[variant].setVar("__SKIPPED", e.args[0])
- if len(datastores) > 1:
- variants = filter(None, datastores.keys())
- safe_d.setVar("__VARIANTS", " ".join(variants))
-
datastores[""] = d
return datastores
More information about the bitbake-devel
mailing list