summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-18 14:21:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-18 14:22:40 +0000
commit9d4f95587424c9e2d3ef7891c8ac7007f8db1f00 (patch)
tree3355cd8936486f66d8c76dcfd1bdf0048a230ad2
parent693ddddd8675ffe1e1c2484482f758af2688b3b7 (diff)
downloadpoky-9d4f95587424c9e2d3ef7891c8ac7007f8db1f00.tar.gz
parse_py: Use absolute paths for FILE
Its possible for relative paths to creep into FILE. These confuse the build system no end as its not clear where they might be releative to. This patch ensures we always use resolved absolute paths for FILE so that things behave in a deterministic way. (Bitbake rev: 658d7daa70e46c2b20973b90ee53f0bbadc8bf5d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py2
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 851a7e6698..8c1bd60abf 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -148,7 +148,7 @@ def handle(fn, d, include):
148 148
149 # DONE WITH PARSING... time to evaluate 149 # DONE WITH PARSING... time to evaluate
150 if ext != ".bbclass": 150 if ext != ".bbclass":
151 data.setVar('FILE', fn, d) 151 data.setVar('FILE', abs_fn, d)
152 152
153 statements.eval(d) 153 statements.eval(d)
154 154
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 102c0e93db..e168d24b4c 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -102,7 +102,7 @@ def handle(fn, data, include):
102 feeder(lineno, s, fn, statements) 102 feeder(lineno, s, fn, statements)
103 103
104 # DONE WITH PARSING... time to evaluate 104 # DONE WITH PARSING... time to evaluate
105 bb.data.setVar('FILE', fn, data) 105 bb.data.setVar('FILE', abs_fn, data)
106 statements.eval(data) 106 statements.eval(data)
107 if oldfile: 107 if oldfile:
108 bb.data.setVar('FILE', oldfile, data) 108 bb.data.setVar('FILE', oldfile, data)