[oe-commits] [bitbake] 05/18: fetch2: Handle multiconfig fetcher issues

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 5d2ef4009313519317808b8390c67c83dc839150
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Aug 31 11:34:23 2016 +0100

    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 at linuxfoundation.org>
---
 lib/bb/fetch2/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 65c426f..11c75cc 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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.