summaryrefslogtreecommitdiffstats
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-06-28 09:44:04 +0100
commit276606afe673387f5344d8156299c3ce474c5098 (patch)
treeea3febfdcb145559498b0ef5e5169b726aa42575
parenteb4a134a60e3ac26a48379675ad6346a44010339 (diff)
downloadpoky-276606afe673387f5344d8156299c3ce474c5098.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: ab6bebddbdefec323e284b6438d9c57b3d8a2cc3) (From OE-Core rev: ac255ca3eacece98f60a1a5d8cfc468f73aa67c7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
569 bb.utils.mkdirhier(dldir) 569 bb.utils.mkdirhier(dldir)
570 570
571 localdata.delVar('MIRRORS') 571 localdata.delVar('MIRRORS')
572 localdata.delVar('FILESPATH') 572 localdata.setVar('FILESPATH', dldir)
573 localdata.setVar('DL_DIR', dldir) 573 localdata.setVar('DL_DIR', dldir)
574 localdata.setVar('PREMIRRORS', mirrors) 574 localdata.setVar('PREMIRRORS', mirrors)
575 575
@@ -700,6 +700,8 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
700 bb.data.update_data(localdata) 700 bb.data.update_data(localdata)
701 701
702 dldir = localdata.expand("${SSTATE_DIR}") 702 dldir = localdata.expand("${SSTATE_DIR}")
703 localdata.delVar('MIRRORS')
704 localdata.setVar('FILESPATH', dldir)
703 localdata.setVar('DL_DIR', dldir) 705 localdata.setVar('DL_DIR', dldir)
704 localdata.setVar('PREMIRRORS', mirrors) 706 localdata.setVar('PREMIRRORS', mirrors)
705 707