summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/data_smart.py2
-rw-r--r--bitbake/lib/bb/parse/ast.py8
2 files changed, 2 insertions, 8 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 83e6f70cd..e76fbbf6c 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -298,6 +298,8 @@ class DataSmart(MutableMapping):
if local_var:
if flag in local_var:
value = copy.copy(local_var[flag])
+ elif flag == "content" and "defaultval" in local_var:
+ value = copy.copy(local_var["defaultval"])
if expand and value:
value = self.expand(value, None)
return value
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 8fffe1e8f..b968db40b 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -115,9 +115,6 @@ class DataNode(AstNode):
if 'flag' in groupd and groupd['flag'] != None:
bb.data.setVarFlag(key, groupd['flag'], val, data)
elif groupd["lazyques"]:
- assigned = bb.data.getVar("__lazy_assigned", data) or []
- assigned.append(key)
- bb.data.setVar("__lazy_assigned", assigned, data)
bb.data.setVarFlag(key, "defaultval", val, data)
else:
bb.data.setVar(key, val, data)
@@ -310,11 +307,6 @@ def handleInherit(statements, filename, lineno, m):
statements.append(InheritNode(filename, lineno, classes.split()))
def finalize(fn, d, variant = None):
- for lazykey in bb.data.getVar("__lazy_assigned", d) or ():
- if bb.data.getVar(lazykey, d) is None:
- val = bb.data.getVarFlag(lazykey, "defaultval", d)
- bb.data.setVar(lazykey, val, d)
-
bb.data.expandKeys(d)
bb.data.update_data(d)
code = []