diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-11 22:41:17 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-11 22:41:17 +0100 |
| commit | 107a9da00640a9e086a8608c20aee48aefd92893 (patch) | |
| tree | 97ace0c2103993bc780b221619391edb5e797432 /bitbake/lib/bb/parse/parse_py/ConfHandler.py | |
| parent | 1ca980646deb13b2cf85b17e78de9faba0191dbf (diff) | |
| download | openembedded-core-107a9da00640a9e086a8608c20aee48aefd92893.tar.gz openembedded-core-107a9da00640a9e086a8608c20aee48aefd92893.tar.bz2 openembedded-core-107a9da00640a9e086a8608c20aee48aefd92893.tar.xz openembedded-core-107a9da00640a9e086a8608c20aee48aefd92893.zip | |
bitbake: Merge further fixes from upstream 1.8 branch
* Make the test functionality work
* Optimise BBPATH handling when changing directory
* Optimise file globing for BBFILES
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py')
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index f8a49689e..c9f1ea13f 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py @@ -102,6 +102,13 @@ def include(oldfn, fn, data, error_out): fn = bb.data.expand(fn, data) oldfn = bb.data.expand(oldfn, data) + if not os.path.isabs(fn): + dname = os.path.dirname(oldfn) + bbpath = "%s:%s" % (dname, bb.data.getVar("BBPATH", data, 1)) + abs_fn = bb.which(bbpath, fn) + if abs_fn: + fn = abs_fn + from bb.parse import handle try: ret = handle(fn, data, True) |