From ab6bebddbdefec323e284b6438d9c57b3d8a2cc3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 28 Apr 2015 11:49:12 +0100 Subject: 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. Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/classes/sstate.bbclass') diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 2f0632af89..a710305086 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -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) -- cgit 1.2.3-korg