diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-19 09:36:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-19 09:41:56 +0000 |
| commit | e6d5e925c402cd2cc7ee034e9de4cc6df8944a34 (patch) | |
| tree | 70d0d3af72518279a33df2f1854b20ea094b7285 | |
| parent | c18b8450640ebfd55a2b35b112959f9ea3e0a700 (diff) | |
| download | bitbake-e6d5e925c402cd2cc7ee034e9de4cc6df8944a34.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/runqueue.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index b7a602b2e..37dc36200 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -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, |