aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-10 23:49:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-11 22:36:27 +0100
commit0d9d7acebe0be42d4cf8a30ecbbbbcb2dfd16a4b (patch)
treee19b0d67432f8e3e581678fb68106356b96002a7 /meta
parent0296dc71c01d1b7953d74ef37d56429e2f4fcfab (diff)
downloadopenembedded-core-0d9d7acebe0be42d4cf8a30ecbbbbcb2dfd16a4b.tar.gz
openembedded-core-0d9d7acebe0be42d4cf8a30ecbbbbcb2dfd16a4b.tar.bz2
openembedded-core-0d9d7acebe0be42d4cf8a30ecbbbbcb2dfd16a4b.zip
sstate: Avoid problems with recipes using SRCPV when fetching sstate
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index d7f1b3f26e..62e45cb4a8 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)