summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r--bitbake/lib/bb/parse/__init__.py4
-rw-r--r--bitbake/lib/bb/parse/ast.py6
2 files changed, 7 insertions, 3 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py
index 95f372b00b..c7249ef050 100644
--- a/bitbake/lib/bb/parse/__init__.py
+++ b/bitbake/lib/bb/parse/__init__.py
@@ -28,6 +28,7 @@ handlers = []
28 28
29import bb, os 29import bb, os
30import bb.utils 30import bb.utils
31import bb.siggen
31 32
32class ParseError(Exception): 33class ParseError(Exception):
33 """Exception raised when parsing fails""" 34 """Exception raised when parsing fails"""
@@ -79,6 +80,9 @@ def init(fn, data):
79 if h['supports'](fn): 80 if h['supports'](fn):
80 return h['init'](data) 81 return h['init'](data)
81 82
83def init_parser(d):
84 bb.parse.siggen = bb.siggen.init(d)
85
82def resolve_file(fn, d): 86def resolve_file(fn, d):
83 if not os.path.isabs(fn): 87 if not os.path.isabs(fn):
84 bbpath = bb.data.getVar("BBPATH", d, True) 88 bbpath = bb.data.getVar("BBPATH", d, True)
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index b800569434..870ae65b0e 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -300,7 +300,7 @@ def handleInherit(statements, m):
300 n = __word__.findall(files) 300 n = __word__.findall(files)
301 statements.append(InheritNode(m.group(1))) 301 statements.append(InheritNode(m.group(1)))
302 302
303def finalize(fn, d): 303def finalize(fn, d, variant = None):
304 for lazykey in bb.data.getVar("__lazy_assigned", d) or (): 304 for lazykey in bb.data.getVar("__lazy_assigned", d) or ():
305 if bb.data.getVar(lazykey, d) is None: 305 if bb.data.getVar(lazykey, d) is None:
306 val = bb.data.getVarFlag(lazykey, "defaultval", d) 306 val = bb.data.getVarFlag(lazykey, "defaultval", d)
@@ -323,7 +323,7 @@ def finalize(fn, d):
323 tasklist = bb.data.getVar('__BBTASKS', d) or [] 323 tasklist = bb.data.getVar('__BBTASKS', d) or []
324 bb.build.add_tasks(tasklist, d) 324 bb.build.add_tasks(tasklist, d)
325 325
326 #bb.data.generate_dependencies(d) 326 bb.parse.siggen.finalise(fn, d, variant)
327 327
328 bb.event.fire(bb.event.RecipeParsed(fn), d) 328 bb.event.fire(bb.event.RecipeParsed(fn), d)
329 329
@@ -433,7 +433,7 @@ def multi_finalize(fn, d):
433 for variant, variant_d in datastores.iteritems(): 433 for variant, variant_d in datastores.iteritems():
434 if variant: 434 if variant:
435 try: 435 try:
436 finalize(fn, variant_d) 436 finalize(fn, variant_d, variant)
437 except bb.parse.SkipPackage: 437 except bb.parse.SkipPackage:
438 bb.data.setVar("__SKIPPED", True, variant_d) 438 bb.data.setVar("__SKIPPED", True, variant_d)
439 439