summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorChris Laplante <chris.laplante@agilent.com>2020-01-16 11:28:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-19 13:31:05 +0000
commit065ab5dce0e8415c3d8c8d4e85e68ea8e9c0347f (patch)
treed850ae14997b0ba33f266eceaa008474bb1e4c7e /bitbake
parent0b9b850537bbcb8be37a091cb15cd4b644b31116 (diff)
downloadpoky-065ab5dce0e8415c3d8c8d4e85e68ea8e9c0347f.tar.gz
bitbake: fetch2: do not suffix srcrev cache key with PN
Prior to this change, two different recipes pulling from the same exact repo could get a different SRCREV during a single parse session. This was originally observed using git. For git at least, it still allows recipes to pull from the same repo, but with different branches or tags, since the form of the srcrev cache key for git is: "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name] Where the 'unresolvedrev' part is the branch or tag name. (Bitbake rev: 6c938e6fd29beebe09b32be839dae008fe6491d2) Signed-off-by: Chris Laplante <chris.laplante@agilent.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 18a6819d5d..406a91cce4 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1567,8 +1567,7 @@ class FetchMethod(object):
1567 return True, str(latest_rev) 1567 return True, str(latest_rev)
1568 1568
1569 def generate_revision_key(self, ud, d, name): 1569 def generate_revision_key(self, ud, d, name):
1570 key = self._revision_key(ud, d, name) 1570 return self._revision_key(ud, d, name)
1571 return "%s-%s" % (key, d.getVar("PN") or "")
1572 1571
1573 def latest_versionstring(self, ud, d): 1572 def latest_versionstring(self, ud, d):
1574 """ 1573 """