aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-28 11:49:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-29 10:39:40 +0100
commitab6bebddbdefec323e284b6438d9c57b3d8a2cc3 (patch)
treef53a9e6e30bdf76401a05719883227f49ef5c502 /meta/classes
parentdf91dd8d064dc3e59c7f057d3f869500a233a76f (diff)
downloadopenembedded-core-ab6bebddbdefec323e284b6438d9c57b3d8a2cc3.tar.gz
openembedded-core-ab6bebddbdefec323e284b6438d9c57b3d8a2cc3.tar.bz2
openembedded-core-ab6bebddbdefec323e284b6438d9c57b3d8a2cc3.zip
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sstate.bbclass4
1 files changed, 3 insertions, 1 deletions
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)