mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: [parser] Preserve include vs. require behaviour

Browse Source 
(Bitbake rev: 6073a5b8e4ca8af8e1a8e0234fad7b08baf76c99)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-02-12 14:41:28 +00:00
parent 71a19386a3
commit 269d4d58a9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/parse/ast.py
+7 -3
View File
@@ -40,10 +40,11 @@ class StatementGroup:
map(lambda x: x.eval(data), self.statements) map(lambda x: x.eval(data), self.statements)
class IncludeNode: class IncludeNode:
def __init__(self, what_file, fn, lineno): def __init__(self, what_file, fn, lineno, force):
self.what_file = what_file self.what_file = what_file
self.from_fn = fn self.from_fn = fn
self.from_lineno = lineno self.from_lineno = lineno
self.force = force
def eval(self, data): def eval(self, data):
""" """
@@ -54,7 +55,10 @@ class IncludeNode:
# TODO: Cache those includes... # TODO: Cache those includes...
statements = StatementGroup() statements = StatementGroup()
bb.parse.ConfHandler.include(statements, self.from_fn, s, data, False) if force:
bb.parse.ConfHandler.include(statements, self.from_fn, s, data, "include required")
else:
bb.parse.ConfHandler.include(statements, self.from_fn, s, data, False)
statements.eval(data) statements.eval(data)
class ExportNode: class ExportNode:
@@ -107,7 +111,7 @@ class DataNode:
def handleInclude(statements, m, fn, lineno, data, force): def handleInclude(statements, m, fn, lineno, data, force):
# AST handling # AST handling
statements.append(IncludeNode(m.group(1), fn, lineno)) statements.append(IncludeNode(m.group(1), fn, lineno, force))
s = bb.data.expand(m.group(1), data) s = bb.data.expand(m.group(1), data)
bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (fn, lineno, s)) bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (fn, lineno, s))