From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 15 Aug 2016 17:01:54 +0000 (+0100)
Subject: cache/cooker: Pass databuilder into bb.cache.Cache()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7da062956bf40c1b9ac1aaee222a13f40bba9b19;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

cache/cooker: Pass databuilder into bb.cache.Cache()

Rather that the current mix of static and class methods, refactor
so that the cache has the databuilder object internally. This becomes
useful for the following patches for multi config support.

It effectively completes some of the object oriented work we've been
working towards in the bitbake core for a while.

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

diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index c915bb93fcb..7118c83f73d 100644
--- a/lib/bb/cache.py
+++ b/lib/bb/cache.py
@@ -270,7 +270,9 @@ class Cache(object):
     BitBake Cache implementation
     """
 
-    def __init__(self, data, data_hash, caches_array):
+    def __init__(self, databuilder, data_hash, caches_array):
+        data = databuilder.data
+
         # Pass caches_array information into Cache Constructor
         # It will be used later for deciding whether we 
         # need extra cache file dump/load support 
@@ -279,7 +281,6 @@ class Cache(object):
         self.clean = set()
         self.checked = set()
         self.depends_cache = {}
-        self.data = None
         self.data_fn = None
         self.cacheclean = True
         self.data_hash = data_hash
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 11c611de72e..43c4f78dbc2 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1974,6 +1974,7 @@ class CookerParser(object):
         self.cooker = cooker
         self.cfgdata = cooker.data
         self.cfghash = cooker.data_hash
+        self.cfgbuilder = cooker.databuilder
 
         # Accounting statistics
         self.parsed = 0
@@ -1988,7 +1989,7 @@ class CookerParser(object):
         self.current = 0
         self.process_names = []
 
-        self.bb_cache = bb.cache.Cache(self.cfgdata, self.cfghash, cooker.caches_array)
+        self.bb_cache = bb.cache.Cache(self.cfgbuilder, self.cfghash, cooker.caches_array)
         self.fromcache = []
         self.willparse = []
         for filename in self.filelist: