mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
sstate: Use SSTATE_DIR for FILESPATH
FILESPATH was only being overridden in one fetch location, it should be equally handled in both. Also use SSTATE_DIR as FILESPATH so that mirror urls which do remapping can search the local SSTATE_DIR for other paths. Also ensure that MIRRORS is removed in both locations, previously it was only unset in one but both codepaths should be consistent. (From OE-Core rev: ab6bebddbdefec323e284b6438d9c57b3d8a2cc3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -569,7 +569,7 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
|
||||
bb.utils.mkdirhier(dldir)
|
||||
|
||||
localdata.delVar('MIRRORS')
|
||||
localdata.delVar('FILESPATH')
|
||||
localdata.setVar('FILESPATH', dldir)
|
||||
localdata.setVar('DL_DIR', dldir)
|
||||
localdata.setVar('PREMIRRORS', mirrors)
|
||||
|
||||
@@ -700,6 +700,8 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
|
||||
bb.data.update_data(localdata)
|
||||
|
||||
dldir = localdata.expand("${SSTATE_DIR}")
|
||||
localdata.delVar('MIRRORS')
|
||||
localdata.setVar('FILESPATH', dldir)
|
||||
localdata.setVar('DL_DIR', dldir)
|
||||
localdata.setVar('PREMIRRORS', mirrors)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user