[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2135/8267] bitbake: fetch2: Handle multiconfig fetcher issues

[Emmanuele Bassi <ebassi src gnome org>]

commit e7b2b7d40da1b9b9c67e6f5b0f4183800c664ddd
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Wed Aug 31 11:34:23 2016 +0100

    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>

 bitbake/lib/bb/fetch2/__init__.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 65c426f..11c75cc 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/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: