From 91c45c016376511e6ca0d2f40eb5be73af09e7ea Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 May 2015 17:30:31 +0100 Subject: bitbake: 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. (Bitbake rev: 508aad9d5db7e51328b1fd6ee53b4bc3720a30b7) Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/parse_py/BBHandler.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 56d4672b0f..85c27c24cc 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/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: -- cgit v1.2.3-54-g00ecf