summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-28 21:27:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-01 21:37:28 +0100
commit0e6473ad750605352aabda3e9d3a17229ba2180d (patch)
treedc7d508713a0c4fca6c468c3dacaa299d8420e71 /meta/classes
parent27fc73496c00e1bed0e1b4d9a8d888492a3a8b9d (diff)
downloadpoky-0e6473ad750605352aabda3e9d3a17229ba2180d.tar.gz
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: d66a45c52200f73e67ebb3e6e447907bb3334319) 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 ace6bdb57a..f17db0b874 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -567,7 +567,7 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
567 bb.utils.mkdirhier(dldir) 567 bb.utils.mkdirhier(dldir)
568 568
569 localdata.delVar('MIRRORS') 569 localdata.delVar('MIRRORS')
570 localdata.delVar('FILESPATH') 570 localdata.setVar('FILESPATH', dldir)
571 localdata.setVar('DL_DIR', dldir) 571 localdata.setVar('DL_DIR', dldir)
572 localdata.setVar('PREMIRRORS', mirrors) 572 localdata.setVar('PREMIRRORS', mirrors)
573 573
@@ -698,6 +698,8 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
698 bb.data.update_data(localdata) 698 bb.data.update_data(localdata)
699 699
700 dldir = localdata.expand("${SSTATE_DIR}") 700 dldir = localdata.expand("${SSTATE_DIR}")
701 localdata.delVar('MIRRORS')
702 localdata.setVar('FILESPATH', dldir)
701 localdata.setVar('DL_DIR', dldir) 703 localdata.setVar('DL_DIR', dldir)
702 localdata.setVar('PREMIRRORS', mirrors) 704 localdata.setVar('PREMIRRORS', mirrors)
703 705