bitbake: fetch2: Handle multiconfig fetcher issues
We need a separate fetcher cache per multiconfig as the revisions and other SRC_URI data can potentially be different. For now, this is the simplest way to achieve that and avoids linux-yocto kernel build failures when targeting multiple machines for example. (Bitbake rev: d98cc31d6668bc1d6372664593126b5e5132ef2c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
26aad57ece
commit
e7b2b7d40d
|
@ -1506,8 +1506,9 @@ class Fetch(object):
|
||||||
self.connection_cache = connection_cache
|
self.connection_cache = connection_cache
|
||||||
|
|
||||||
fn = d.getVar('FILE', True)
|
fn = d.getVar('FILE', True)
|
||||||
if cache and fn and fn in urldata_cache:
|
mc = d.getVar('__BBMULTICONFIG', True) or ""
|
||||||
self.ud = urldata_cache[fn]
|
if cache and fn and mc + fn in urldata_cache:
|
||||||
|
self.ud = urldata_cache[mc + fn]
|
||||||
|
|
||||||
for url in urls:
|
for url in urls:
|
||||||
if url not in self.ud:
|
if url not in self.ud:
|
||||||
|
@ -1519,7 +1520,7 @@ class Fetch(object):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if fn and cache:
|
if fn and cache:
|
||||||
urldata_cache[fn] = self.ud
|
urldata_cache[mc + fn] = self.ud
|
||||||
|
|
||||||
def localpath(self, url):
|
def localpath(self, url):
|
||||||
if url not in self.urls:
|
if url not in self.urls:
|
||||||
|
|
Loading…
Reference in New Issue