diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-11-19 11:46:42 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:43 +0000 |
commit | 739bb5a2d1c821b8e44c0551bdd0fd323000b6af (patch) | |
tree | c07440b40343cf4b807618f0eae7e5dd1739bda8 /bitbake/lib/bb/runqueue.py | |
parent | 065da895d2b5eced3e444b20627f8f460e6d14c7 (diff) | |
download | poky-739bb5a2d1c821b8e44c0551bdd0fd323000b6af.tar.gz |
cooker: stop loading the cache for -b
Previously, the cache was actually being loaded from disk twice whenever using
-b or -e -b. This also moves the bb_cache instance into the CookerParser, as
it's not needed by the cooker itself at all.
(Bitbake rev: dd0ec2f7b18e2a9ab06c499b775670516bd06ac8)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index a80feb9504..6282e5cf9b 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1015,7 +1015,7 @@ class RunQueue: | |||
1015 | for task in range(len(self.rqdata.runq_fnid)): | 1015 | for task in range(len(self.rqdata.runq_fnid)): |
1016 | if self.rqdata.runq_fnid[task] not in done: | 1016 | if self.rqdata.runq_fnid[task] not in done: |
1017 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] | 1017 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] |
1018 | the_data = self.cooker.bb_cache.loadDataFull(fn, self.cooker.get_file_appends(fn), self.cooker.configuration.data) | 1018 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.get_file_appends(fn), self.cooker.configuration.data) |
1019 | done.add(self.rqdata.runq_fnid[task]) | 1019 | done.add(self.rqdata.runq_fnid[task]) |
1020 | 1020 | ||
1021 | bb.parse.siggen.dump_sigs(self.rqdata.dataCache) | 1021 | bb.parse.siggen.dump_sigs(self.rqdata.dataCache) |
@@ -1088,7 +1088,7 @@ class RunQueueExecute: | |||
1088 | return | 1088 | return |
1089 | 1089 | ||
1090 | def fork_off_task(self, fn, task, taskname): | 1090 | def fork_off_task(self, fn, task, taskname): |
1091 | the_data = self.cooker.bb_cache.loadDataFull(fn, self.cooker.get_file_appends(fn), self.cooker.configuration.data) | 1091 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.get_file_appends(fn), self.cooker.configuration.data) |
1092 | 1092 | ||
1093 | env = bb.data.export_vars(the_data) | 1093 | env = bb.data.export_vars(the_data) |
1094 | env = bb.data.export_envvars(env, the_data) | 1094 | env = bb.data.export_envvars(env, the_data) |