[PATCH 2/2] sstate: Avoid problems with recipes using SRCPV when fetching sstate
From: Richard Purdie <hidden>
Date: 2021-09-11 10:04:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
When fetching sstate, SRCPV can be expanded withuin PV which breaks the sstate fetcher as other variables like SRC_URI are changed by the fetcher code. Expand the variable before doing this to avoid those problems and hence avoid setscene task failures with remote sstate storage in git recipes. Signed-off-by: Richard Purdie <redacted> --- meta/classes/sstate.bbclass | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index d7f1b3f26ed..62e45cb4a8b 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass@@ -731,6 +731,7 @@ def pstaging_fetch(sstatefetch, d): localdata.setVar('FILESPATH', dldir) localdata.setVar('DL_DIR', dldir) localdata.setVar('PREMIRRORS', mirrors) + localdata.setVar('SRCPV', d.getVar('SRCPV')) # if BB_NO_NETWORK is set but we also have SSTATE_MIRROR_ALLOW_NETWORK, # we'll want to allow network access for the current set of fetches.
@@ -755,6 +756,9 @@ def pstaging_fetch(sstatefetch, d): except bb.fetch2.BBFetchException: pass +pstaging_fetch[vardepsexclude] += "SRCPV" + + def sstate_setscene(d): shared_state = sstate_state_fromvars(d) accelerate = sstate_installpkg(shared_state, d)
--
2.32.0