summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-15 18:01:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-18 10:06:26 +0100
commite79550ea8708f82aa720a47c5ed9a8aab1182458 (patch)
treeec719d8eb3c9828f14146ea6512b3e478d1dfffa /bitbake/lib
parent97ce9126a6de2faf78441f686a1b52b5f68f9a62 (diff)
downloadpoky-e79550ea8708f82aa720a47c5ed9a8aab1182458.tar.gz
bitbake: 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. (Bitbake rev: 7da062956bf40c1b9ac1aaee222a13f40bba9b19) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cache.py5
-rw-r--r--bitbake/lib/bb/cooker.py3
2 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index c915bb93fc..7118c83f73 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -270,7 +270,9 @@ class Cache(object):
270 BitBake Cache implementation 270 BitBake Cache implementation
271 """ 271 """
272 272
273 def __init__(self, data, data_hash, caches_array): 273 def __init__(self, databuilder, data_hash, caches_array):
274 data = databuilder.data
275
274 # Pass caches_array information into Cache Constructor 276 # Pass caches_array information into Cache Constructor
275 # It will be used later for deciding whether we 277 # It will be used later for deciding whether we
276 # need extra cache file dump/load support 278 # need extra cache file dump/load support
@@ -279,7 +281,6 @@ class Cache(object):
279 self.clean = set() 281 self.clean = set()
280 self.checked = set() 282 self.checked = set()
281 self.depends_cache = {} 283 self.depends_cache = {}
282 self.data = None
283 self.data_fn = None 284 self.data_fn = None
284 self.cacheclean = True 285 self.cacheclean = True
285 self.data_hash = data_hash 286 self.data_hash = data_hash
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 11c611de72..43c4f78dbc 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1974,6 +1974,7 @@ class CookerParser(object):
1974 self.cooker = cooker 1974 self.cooker = cooker
1975 self.cfgdata = cooker.data 1975 self.cfgdata = cooker.data
1976 self.cfghash = cooker.data_hash 1976 self.cfghash = cooker.data_hash
1977 self.cfgbuilder = cooker.databuilder
1977 1978
1978 # Accounting statistics 1979 # Accounting statistics
1979 self.parsed = 0 1980 self.parsed = 0
@@ -1988,7 +1989,7 @@ class CookerParser(object):
1988 self.current = 0 1989 self.current = 0
1989 self.process_names = [] 1990 self.process_names = []
1990 1991
1991 self.bb_cache = bb.cache.Cache(self.cfgdata, self.cfghash, cooker.caches_array) 1992 self.bb_cache = bb.cache.Cache(self.cfgbuilder, self.cfghash, cooker.caches_array)
1992 self.fromcache = [] 1993 self.fromcache = []
1993 self.willparse = [] 1994 self.willparse = []
1994 for filename in self.filelist: 1995 for filename in self.filelist: