From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 31 Aug 2016 10:34:23 +0000 (+0100)
Subject: fetch2: Handle multiconfig fetcher issues
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d98cc31d6668bc1d6372664593126b5e5132ef2c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 65c426f8fb9..11c75cc7236 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1506,8 +1506,9 @@ class Fetch(object):
         self.connection_cache = connection_cache
 
         fn = d.getVar('FILE', True)
-        if cache and fn and fn in urldata_cache:
-            self.ud = urldata_cache[fn]
+        mc = d.getVar('__BBMULTICONFIG', True) or ""
+        if cache and fn and mc + fn in urldata_cache:
+            self.ud = urldata_cache[mc + fn]
 
         for url in urls:
             if url not in self.ud:
@@ -1519,7 +1520,7 @@ class Fetch(object):
                         pass
 
         if fn and cache:
-            urldata_cache[fn] = self.ud
+            urldata_cache[mc + fn] = self.ud
 
     def localpath(self, url):
         if url not in self.urls: