diff options
| -rwxr-xr-x | bin/bitbake-worker | 2 | ||||
| -rw-r--r-- | lib/bb/runqueue.py | 4 | ||||
| -rw-r--r-- | lib/bb/siggen.py | 9 |
3 files changed, 7 insertions, 8 deletions
diff --git a/bin/bitbake-worker b/bin/bitbake-worker index c7992f7e8..b2935f6ec 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -168,7 +168,7 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat data.setVar("BUILDNAME", workerdata["buildname"]) data.setVar("DATE", workerdata["date"]) data.setVar("TIME", workerdata["time"]) - bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"]) + bb.parse.siggen.set_taskdata(workerdata["sigdata"]) ret = 0 try: the_data = bb.cache.Cache.loadDataFull(fn, appends, data) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 39df79473..6d9cf3f4d 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -879,9 +879,7 @@ class RunQueue: "fakerootenv" : self.rqdata.dataCache.fakerootenv, "fakerootdirs" : self.rqdata.dataCache.fakerootdirs, "fakerootnoenv" : self.rqdata.dataCache.fakerootnoenv, - "hashes" : bb.parse.siggen.taskhash, - "hash_deps" : bb.parse.siggen.runtaskdeps, - "sigchecksums" : bb.parse.siggen.file_checksum_values, + "sigdata" : bb.parse.siggen.get_taskdata(), "runq_hash" : self.rqdata.runq_hash, "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel, "logdefaultverbose" : bb.msg.loggerDefaultVerbose, diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 548f50dfc..86d9ca059 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -197,10 +197,11 @@ class SignatureGeneratorBasic(SignatureGenerator): #d.setVar("BB_TASKHASH_task-%s" % task, taskhash[task]) return h - def set_taskdata(self, hashes, deps, checksums): - self.runtaskdeps = deps - self.taskhash = hashes - self.file_checksum_values = checksums + def get_taskdata(self): + return (self.runtaskdeps, self.taskhash, self.file_checksum_values) + + def set_taskdata(self, data): + self.runtaskdeps, self.taskhash, self.file_checksum_values = data def dump_sigtask(self, fn, task, stampbase, runtime): k = fn + "." + task |