sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: runqueue: Fix data being written into siginfo/sigdata files 

The way hash_deps was being generated was different to the way siggen generated
the data internally which lead to seemingly different sigdata/siginfo files
for the same checksum. The -S output correct but the files written during
builds contained superflous data which would look like a difference.

This patch removes the badly duplicated data and uses it from the source
which ensures its consistent.

(Bitbake rev: e6d5e925c402cd2cc7ee034e9de4cc6df8944a34)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-12-19 09:36:58 +00:00
parent bc1e359aae
commit 6d2f3440bb
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bitbake/lib/bb/runqueue.py
View File

@ -802,19 +802,6 @@ 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)
self.hashes = {}
self.hash_deps = {}
for task in xrange(len(self.runq_fnid)):
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]:
depidentifier = '%s.%s' % (self.taskData.fn_index[self.runq_fnid[dep]],
self.runq_task[dep])
deps.append(depidentifier)
self.hash_deps[identifier] = deps
return len(self.runq_fnid)
def dump_data(self, taskQueue):
@ -883,8 +870,8 @@ class RunQueue:
"fakerootenv" : self.rqdata.dataCache.fakerootenv,
"fakerootdirs" : self.rqdata.dataCache.fakerootdirs,
"fakerootnoenv" : self.rqdata.dataCache.fakerootnoenv,
"hashes" : self.rqdata.hashes,
"hash_deps" : self.rqdata.hash_deps,
"hashes" : bb.parse.siggen.taskhash,
"hash_deps" : bb.parse.siggen.runtaskdeps,
"sigchecksums" : bb.parse.siggen.file_checksum_values,
"runq_hash" : self.rqdata.runq_hash,
"logdefaultdebug" : bb.msg.loggerDefaultDebugLevel,