diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-18 14:21:15 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-18 14:22:40 +0000 |
| commit | 9d4f95587424c9e2d3ef7891c8ac7007f8db1f00 (patch) | |
| tree | 3355cd8936486f66d8c76dcfd1bdf0048a230ad2 /bitbake/lib | |
| parent | 693ddddd8675ffe1e1c2484482f758af2688b3b7 (diff) | |
| download | ast2050-yocto-poky-9d4f95587424c9e2d3ef7891c8ac7007f8db1f00.zip ast2050-yocto-poky-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>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 2 |
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 851a7e6..8c1bd60 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): # DONE WITH PARSING... time to evaluate if ext != ".bbclass": - data.setVar('FILE', fn, d) + data.setVar('FILE', abs_fn, d) statements.eval(d) diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index 102c0e9..e168d24 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): feeder(lineno, s, fn, statements) # DONE WITH PARSING... time to evaluate - bb.data.setVar('FILE', fn, data) + bb.data.setVar('FILE', abs_fn, data) statements.eval(data) if oldfile: bb.data.setVar('FILE', oldfile, data) |
