summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake-worker2
-rw-r--r--bitbake/lib/bb/runqueue.py4
-rw-r--r--bitbake/lib/bb/siggen.py9
3 files changed, 7 insertions, 8 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index c7992f7e82..b2935f6ec0 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -168,7 +168,7 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat
168 data.setVar("BUILDNAME", workerdata["buildname"]) 168 data.setVar("BUILDNAME", workerdata["buildname"])
169 data.setVar("DATE", workerdata["date"]) 169 data.setVar("DATE", workerdata["date"])
170 data.setVar("TIME", workerdata["time"]) 170 data.setVar("TIME", workerdata["time"])
171 bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"]) 171 bb.parse.siggen.set_taskdata(workerdata["sigdata"])
172 ret = 0 172 ret = 0
173 try: 173 try:
174 the_data = bb.cache.Cache.loadDataFull(fn, appends, data) 174 the_data = bb.cache.Cache.loadDataFull(fn, appends, data)
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 39df79473e..6d9cf3f4df 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -879,9 +879,7 @@ class RunQueue:
879 "fakerootenv" : self.rqdata.dataCache.fakerootenv, 879 "fakerootenv" : self.rqdata.dataCache.fakerootenv,
880 "fakerootdirs" : self.rqdata.dataCache.fakerootdirs, 880 "fakerootdirs" : self.rqdata.dataCache.fakerootdirs,
881 "fakerootnoenv" : self.rqdata.dataCache.fakerootnoenv, 881 "fakerootnoenv" : self.rqdata.dataCache.fakerootnoenv,
882 "hashes" : bb.parse.siggen.taskhash, 882 "sigdata" : bb.parse.siggen.get_taskdata(),
883 "hash_deps" : bb.parse.siggen.runtaskdeps,
884 "sigchecksums" : bb.parse.siggen.file_checksum_values,
885 "runq_hash" : self.rqdata.runq_hash, 883 "runq_hash" : self.rqdata.runq_hash,
886 "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel, 884 "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel,
887 "logdefaultverbose" : bb.msg.loggerDefaultVerbose, 885 "logdefaultverbose" : bb.msg.loggerDefaultVerbose,
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 548f50dfcf..86d9ca0593 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -197,10 +197,11 @@ class SignatureGeneratorBasic(SignatureGenerator):
197 #d.setVar("BB_TASKHASH_task-%s" % task, taskhash[task]) 197 #d.setVar("BB_TASKHASH_task-%s" % task, taskhash[task])
198 return h 198 return h
199 199
200 def set_taskdata(self, hashes, deps, checksums): 200 def get_taskdata(self):
201 self.runtaskdeps = deps 201 return (self.runtaskdeps, self.taskhash, self.file_checksum_values)
202 self.taskhash = hashes 202
203 self.file_checksum_values = checksums 203 def set_taskdata(self, data):
204 self.runtaskdeps, self.taskhash, self.file_checksum_values = data
204 205
205 def dump_sigtask(self, fn, task, stampbase, runtime): 206 def dump_sigtask(self, fn, task, stampbase, runtime):
206 k = fn + "." + task 207 k = fn + "." + task