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>2012-01-30 16:16:11 +0000
commitda56e3df881e1198fbcc8c513fe09da59ac88674 (patch)
treef5dc5642f3b1b013b7760535d4b9e7f2bc2be07c
parent388dbe4928ed7a3a46c34f16092de22979a9d52c (diff)
downloadpoky-da56e3df881e1198fbcc8c513fe09da59ac88674.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 c59b468e0b..e2615c6dec 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)