diff options
| author |   Chris Laplante <chris.laplante@agilent.com> | 2020-01-16 11:28:03 -0500 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2020-02-08 13:20:03 -0800 |
| commit | 63556259f2e34003ad0618a8fe19e1cfe8aef5c9 (patch) | |
| tree | 20c20802c94aac41975d754683dc2a5ca8c53891 | |
| parent | 1a026d4aca47ed1b0b74a8a818635e7520e8f9c8 (diff) | |
| download | bitbake-contrib-63556259f2e34003ad0618a8fe19e1cfe8aef5c9.tar.gz | |
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.
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>
| -rw-r--r-- | lib/bb/fetch2/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 731c16089..4a781bde2 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1567,8 +1567,7 @@ class FetchMethod(object): return True, str(latest_rev) def generate_revision_key(self, ud, d, name): - key = self._revision_key(ud, d, name) - return "%s-%s" % (key, d.getVar("PN") or "") + return self._revision_key(ud, d, name) def latest_versionstring(self, ud, d): """ |