[oe-commits] Richard Purdie : sstate: Use SSTATE_DIR for FILESPATH
git at git.openembedded.org
git at git.openembedded.org
Tue Apr 28 10:57:30 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 4f281ddb7a6253e9e22a22335205e32b2632d49d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4f281ddb7a6253e9e22a22335205e32b2632d49d
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Tue Apr 28 11:49:12 2015 +0100
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 at linuxfoundation.org>
---
meta/classes/sstate.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 2f0632a..a710305 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)
More information about the Openembedded-commits
mailing list