summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/runqueue.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-19 09:36:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-20 12:26:05 +0000
commit6d2f3440bba61bf7460d04c1dde34757d2ae6725 (patch)
treef94c2b7d8ebac72348d892dfe8ca341cb553cfd4 /bitbake/lib/bb/runqueue.py
parentbc1e359aaefeeddf8525b46eb80ac14db7f637b3 (diff)
downloadpoky-6d2f3440bba61bf7460d04c1dde34757d2ae6725.tar.gz
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>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r--bitbake/lib/bb/runqueue.py17
1 files changed, 2 insertions, 15 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index b7a602b2e2..37dc362008 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -802,19 +802,6 @@ class RunQueueData:
802 procdep.append(self.taskData.fn_index[self.runq_fnid[dep]] + "." + self.runq_task[dep]) 802 procdep.append(self.taskData.fn_index[self.runq_fnid[dep]] + "." + self.runq_task[dep])
803 self.runq_hash[task] = bb.parse.siggen.get_taskhash(self.taskData.fn_index[self.runq_fnid[task]], self.runq_task[task], procdep, self.dataCache) 803 self.runq_hash[task] = bb.parse.siggen.get_taskhash(self.taskData.fn_index[self.runq_fnid[task]], self.runq_task[task], procdep, self.dataCache)
804 804
805 self.hashes = {}
806 self.hash_deps = {}
807 for task in xrange(len(self.runq_fnid)):
808 identifier = '%s.%s' % (self.taskData.fn_index[self.runq_fnid[task]],
809 self.runq_task[task])
810 self.hashes[identifier] = self.runq_hash[task]
811 deps = []
812 for dep in self.runq_depends[task]:
813 depidentifier = '%s.%s' % (self.taskData.fn_index[self.runq_fnid[dep]],
814 self.runq_task[dep])
815 deps.append(depidentifier)
816 self.hash_deps[identifier] = deps
817
818 return len(self.runq_fnid) 805 return len(self.runq_fnid)
819 806
820 def dump_data(self, taskQueue): 807 def dump_data(self, taskQueue):
@@ -883,8 +870,8 @@ class RunQueue:
883 "fakerootenv" : self.rqdata.dataCache.fakerootenv, 870 "fakerootenv" : self.rqdata.dataCache.fakerootenv,
884 "fakerootdirs" : self.rqdata.dataCache.fakerootdirs, 871 "fakerootdirs" : self.rqdata.dataCache.fakerootdirs,
885 "fakerootnoenv" : self.rqdata.dataCache.fakerootnoenv, 872 "fakerootnoenv" : self.rqdata.dataCache.fakerootnoenv,
886 "hashes" : self.rqdata.hashes, 873 "hashes" : bb.parse.siggen.taskhash,
887 "hash_deps" : self.rqdata.hash_deps, 874 "hash_deps" : bb.parse.siggen.runtaskdeps,
888 "sigchecksums" : bb.parse.siggen.file_checksum_values, 875 "sigchecksums" : bb.parse.siggen.file_checksum_values,
889 "runq_hash" : self.rqdata.runq_hash, 876 "runq_hash" : self.rqdata.runq_hash,
890 "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel, 877 "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel,