diff options
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 83e6f70cd7..e76fbbf6ce 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -298,6 +298,8 @@ class DataSmart(MutableMapping): | |||
298 | if local_var: | 298 | if local_var: |
299 | if flag in local_var: | 299 | if flag in local_var: |
300 | value = copy.copy(local_var[flag]) | 300 | value = copy.copy(local_var[flag]) |
301 | elif flag == "content" and "defaultval" in local_var: | ||
302 | value = copy.copy(local_var["defaultval"]) | ||
301 | if expand and value: | 303 | if expand and value: |
302 | value = self.expand(value, None) | 304 | value = self.expand(value, None) |
303 | return value | 305 | return value |
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 8fffe1e8f0..b968db40b3 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -115,9 +115,6 @@ class DataNode(AstNode): | |||
115 | if 'flag' in groupd and groupd['flag'] != None: | 115 | if 'flag' in groupd and groupd['flag'] != None: |
116 | bb.data.setVarFlag(key, groupd['flag'], val, data) | 116 | bb.data.setVarFlag(key, groupd['flag'], val, data) |
117 | elif groupd["lazyques"]: | 117 | elif groupd["lazyques"]: |
118 | assigned = bb.data.getVar("__lazy_assigned", data) or [] | ||
119 | assigned.append(key) | ||
120 | bb.data.setVar("__lazy_assigned", assigned, data) | ||
121 | bb.data.setVarFlag(key, "defaultval", val, data) | 118 | bb.data.setVarFlag(key, "defaultval", val, data) |
122 | else: | 119 | else: |
123 | bb.data.setVar(key, val, data) | 120 | bb.data.setVar(key, val, data) |
@@ -310,11 +307,6 @@ def handleInherit(statements, filename, lineno, m): | |||
310 | statements.append(InheritNode(filename, lineno, classes.split())) | 307 | statements.append(InheritNode(filename, lineno, classes.split())) |
311 | 308 | ||
312 | def finalize(fn, d, variant = None): | 309 | def finalize(fn, d, variant = None): |
313 | for lazykey in bb.data.getVar("__lazy_assigned", d) or (): | ||
314 | if bb.data.getVar(lazykey, d) is None: | ||
315 | val = bb.data.getVarFlag(lazykey, "defaultval", d) | ||
316 | bb.data.setVar(lazykey, val, d) | ||
317 | |||
318 | bb.data.expandKeys(d) | 310 | bb.data.expandKeys(d) |
319 | bb.data.update_data(d) | 311 | bb.data.update_data(d) |
320 | code = [] | 312 | code = [] |