diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-10 22:32:46 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-10 22:32:46 +0000 |
| commit | 0b3d443fc1fcfdeea818abea10e8e52a9a937bfd (patch) | |
| tree | 3690ff3b68ed92b81069e03bc4d1349a18754f29 /bitbake | |
| parent | 4428aabc92c3f70b7bf79aae5f2c2165f5b43119 (diff) | |
| download | openembedded-core-contrib-0b3d443fc1fcfdeea818abea10e8e52a9a937bfd.tar.gz | |
bitbake/runqueue.py: Simplify hashdata storage since we're not using an external script for tasks anymore, in line with bitbake-upstream
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 6ba82a338c..a508d137c8 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -703,21 +703,18 @@ class RunQueueData: procdep.append(self.taskData.fn_index[self.runq_fnid[dep]] + "." + self.runq_task[dep]) self.runq_hash[task] = bb.parse.siggen.get_taskhash(self.taskData.fn_index[self.runq_fnid[task]], self.runq_task[task], procdep, self.dataCache) - hashdata = {} - hashdata["hashes"] = {} - hashdata["deps"] = {} + self.hashes = {} + self.hash_deps = {} for task in xrange(len(self.runq_fnid)): - hashdata["hashes"][self.taskData.fn_index[self.runq_fnid[task]] + "." + self.runq_task[task]] = self.runq_hash[task] + identifier = '%s.%s' % (self.taskData.fn_index[self.runq_fnid[task]], + self.runq_task[task]) + self.hashes[identifier] = self.runq_hash[task] deps = [] for dep in self.runq_depends[task]: - deps.append(self.taskData.fn_index[self.runq_fnid[dep]] + "." + self.runq_task[dep]) - hashdata["deps"][self.taskData.fn_index[self.runq_fnid[task]] + "." + self.runq_task[task]] = deps - - hashdata["msg-debug"] = self.cooker.configuration.debug - hashdata["msg-debug-domains"] = self.cooker.configuration.debug_domains - hashdata["verbose"] = self.cooker.configuration.verbose - - self.hashdata = hashdata + depidentifier = '%s.%s' % (self.taskData.fn_index[self.runq_fnid[dep]], + self.runq_task[dep]) + deps.append(depidentifier) + self.hash_deps[identifier] = deps # Remove stamps for targets if force mode active if self.cooker.configuration.force: @@ -1119,12 +1116,12 @@ class RunQueueExecute: the_data.setVarFlag(taskname, "quieterrors", "1") bb.data.setVar("BB_WORKERCONTEXT", "1", the_data) - bb.parse.siggen.set_taskdata(self.rqdata.hashdata["hashes"], self.rqdata.hashdata["deps"]) + bb.parse.siggen.set_taskdata(self.rqdata.hashes, self.rqdata.hash_deps) - for h in self.rqdata.hashdata["hashes"]: - bb.data.setVar("BBHASH_%s" % h, self.rqdata.hashdata["hashes"][h], the_data) - for h in self.rqdata.hashdata["deps"]: - bb.data.setVar("BBHASHDEPS_%s" % h, self.rqdata.hashdata["deps"][h], the_data) + for h in self.rqdata.hashes: + bb.data.setVar("BBHASH_%s" % h, self.rqdata.hashes[h], the_data) + for h in self.rqdata.hash_deps: + bb.data.setVar("BBHASHDEPS_%s" % h, self.rqdata.hash_deps[h], the_data) bb.data.setVar("BB_TASKHASH", self.rqdata.runq_hash[task], the_data) |