diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-27 17:30:31 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-29 10:14:41 +0100 |
| commit | 508aad9d5db7e51328b1fd6ee53b4bc3720a30b7 (patch) | |
| tree | 204ed450c2c40cc4e5decddf67e0d9e171f9c706 /lib | |
| parent | d3d2541aacd1ea560da0d8b25a3ea3f0563dee70 (diff) | |
| download | bitbake-508aad9d5db7e51328b1fd6ee53b4bc3720a30b7.tar.gz | |
BBHandler: Drop cwd from search path
Whilst bitbake has done this for a long time, the behaviour of resolving
class files against cwd is not desirable. This can be seen during
base configuration parsing when looking for base.bbclass where a dependency
on cwd is added. If cwd then changes, the cache is invalid and triggers a
re-parse.
The only real option is to drop this entry and if files can't be found, we
fix BBPATH in the cases where it needs fixing. I didn't find any in the
random selection of layers I tested parsing locally.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/parse/parse_py/BBHandler.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index 56d4672b0..85c27c24c 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -76,8 +76,7 @@ def inherit(files, fn, lineno, d): file = os.path.join('classes', '%s.bbclass' % file) if not os.path.isabs(file): - dname = os.path.dirname(fn) - bbpath = "%s:%s" % (dname, d.getVar("BBPATH", True)) + bbpath = d.getVar("BBPATH", True) abs_fn, attempts = bb.utils.which(bbpath, file, history=True) for af in attempts: if af != abs_fn: |