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-02-11 23:02:13 +0000
commit2edae751cfeb6cf71c17edeaba6f5d265c9005b9 (patch)
tree1a3f79567da2a929063f9c992960461ffe0f93ea /bitbake
parent73fe0e273b4e00dcb08122c4f54fc65316e2a793 (diff)
downloadpoky-2edae751cfeb6cf71c17edeaba6f5d265c9005b9.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: 63556259f2e34003ad0618a8fe19e1cfe8aef5c9) Signed-off-by: Chris Laplante <chris.laplante@agilent.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 6c938e6fd29beebe09b32be839dae008fe6491d2) Signed-off-by: Armin Kuster <akuster808@gmail.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 731c160892..4a781bde24 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 """