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>
This commit is contained in:
parent
4428aabc92
commit
0b3d443fc1
|
@ -703,21 +703,18 @@ class RunQueueData:
|
||||||
procdep.append(self.taskData.fn_index[self.runq_fnid[dep]] + "." + self.runq_task[dep])
|
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)
|
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 = {}
|
self.hashes = {}
|
||||||
hashdata["hashes"] = {}
|
self.hash_deps = {}
|
||||||
hashdata["deps"] = {}
|
|
||||||
for task in xrange(len(self.runq_fnid)):
|
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 = []
|
deps = []
|
||||||
for dep in self.runq_depends[task]:
|
for dep in self.runq_depends[task]:
|
||||||
deps.append(self.taskData.fn_index[self.runq_fnid[dep]] + "." + self.runq_task[dep])
|
depidentifier = '%s.%s' % (self.taskData.fn_index[self.runq_fnid[dep]],
|
||||||
hashdata["deps"][self.taskData.fn_index[self.runq_fnid[task]] + "." + self.runq_task[task]] = deps
|
self.runq_task[dep])
|
||||||
|
deps.append(depidentifier)
|
||||||
hashdata["msg-debug"] = self.cooker.configuration.debug
|
self.hash_deps[identifier] = deps
|
||||||
hashdata["msg-debug-domains"] = self.cooker.configuration.debug_domains
|
|
||||||
hashdata["verbose"] = self.cooker.configuration.verbose
|
|
||||||
|
|
||||||
self.hashdata = hashdata
|
|
||||||
|
|
||||||
# Remove stamps for targets if force mode active
|
# Remove stamps for targets if force mode active
|
||||||
if self.cooker.configuration.force:
|
if self.cooker.configuration.force:
|
||||||
|
@ -1119,12 +1116,12 @@ class RunQueueExecute:
|
||||||
the_data.setVarFlag(taskname, "quieterrors", "1")
|
the_data.setVarFlag(taskname, "quieterrors", "1")
|
||||||
|
|
||||||
bb.data.setVar("BB_WORKERCONTEXT", "1", the_data)
|
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"]:
|
for h in self.rqdata.hashes:
|
||||||
bb.data.setVar("BBHASH_%s" % h, self.rqdata.hashdata["hashes"][h], the_data)
|
bb.data.setVar("BBHASH_%s" % h, self.rqdata.hashes[h], the_data)
|
||||||
for h in self.rqdata.hashdata["deps"]:
|
for h in self.rqdata.hash_deps:
|
||||||
bb.data.setVar("BBHASHDEPS_%s" % h, self.rqdata.hashdata["deps"][h], the_data)
|
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)
|
bb.data.setVar("BB_TASKHASH", self.rqdata.runq_hash[task], the_data)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue