MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitbake: fetch2: Ensure cached url data is matched to a datastore

Browse Source 
There was a weird error in OE-Core where "devtool modify virtual/kernel"
was showing basehash mismatch errors. This was due to SRCPV sometimes being:
AUTOINC+b867b78b50_47b80ef7bd and sometimes AUTOINC+b867b78b50_255a750d28.

The latter hash comes from KBRANCH and meant sometimes the correct branch
was seen, sometimes it was not. The issue was complicated by the execution
using a remote datastore over tinfoil.

The problem turns out to be a fetcher caching error. If the datastore
changes, the cached url data may not be valid.

We therefore ensure we match cached url data against the datastore that
generated it, which appears to fix this issue.

(Bitbake rev: 4ce50bbd34eefeabfeca89a6a66c71598d3c58f6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2019-11-02 17:57:10 +00:00
parent b021992106
commit d9879a1f60
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitbake/lib/bb/fetch2/__init__.py
View File

@ -1595,7 +1595,7 @@ class Fetch(object):
fn = d.getVar('FILE')
mc = d.getVar('__BBMULTICONFIG') or ""
if cache and fn and mc + fn in urldata_cache:
self.ud = urldata_cache[mc + fn]
self.ud = urldata_cache[mc + fn + str(id(d))]
for url in urls:
if url not in self.ud:
@ -1607,7 +1607,7 @@ class Fetch(object):
pass
if fn and cache:
urldata_cache[mc + fn] = self.ud
urldata_cache[mc + fn + str(id(d))] = self.ud
def localpath(self, url):
if url not in self.urls: