diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-28 21:27:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-01 21:27:48 +0100 |
| commit | d66a45c52200f73e67ebb3e6e447907bb3334319 (patch) | |
| tree | 0b2a1e8b938c1d4ee595118d6400f2d03d55b9ab | |
| parent | d0bf0e5fd9c2cb18437ccca14b2f41d410aa832a (diff) | |
| download | openembedded-core-d66a45c52200f73e67ebb3e6e447907bb3334319.tar.gz openembedded-core-d66a45c52200f73e67ebb3e6e447907bb3334319.tar.bz2 openembedded-core-d66a45c52200f73e67ebb3e6e447907bb3334319.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>
| -rw-r--r-- | meta/classes/sstate.bbclass | 4 |
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): bb.utils.mkdirhier(dldir) localdata.delVar('MIRRORS') - localdata.delVar('FILESPATH') + localdata.setVar('FILESPATH', dldir) localdata.setVar('DL_DIR', dldir) localdata.setVar('PREMIRRORS', mirrors) @@ -698,6 +698,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) |