1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00

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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-05-27 17:30:31 +01:00
parent 08b77c8cef
commit 91c45c0163
+1 -2
View File
@@ -76,8 +76,7 @@ def inherit(files, fn, lineno, d):
file = os.path.join('classes', '%s.bbclass' % file) file = os.path.join('classes', '%s.bbclass' % file)
if not os.path.isabs(file): if not os.path.isabs(file):
dname = os.path.dirname(fn) bbpath = d.getVar("BBPATH", True)
bbpath = "%s:%s" % (dname, d.getVar("BBPATH", True))
abs_fn, attempts = bb.utils.which(bbpath, file, history=True) abs_fn, attempts = bb.utils.which(bbpath, file, history=True)
for af in attempts: for af in attempts:
if af != abs_fn: if af != abs_fn: