From 172095e09f3b0fc0e287aebcf922872475a9991d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 26 Mar 2014 13:47:29 +0000 Subject: [PATCH] bitbake: runqueue/siggen: Pass in commandline options to dump_sigs() This allows the commandline options to be processed in the dump signature code. (Bitbake rev: ef8537a2e9b48f4fe065a165c102935aee2c9029) Signed-off-by: Richard Purdie --- bitbake/lib/bb/runqueue.py | 6 +++--- bitbake/lib/bb/siggen.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 423b03c181..42b6c48ca9 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1040,7 +1040,7 @@ class RunQueue: if dump: if 'printdiff' in dump: invalidtasks = self.print_diffscenetasks() - self.dump_signatures() + self.dump_signatures(dump) if 'printdiff' in dump: self.write_diffscenetasks(invalidtasks) self.state = runQueueComplete @@ -1113,7 +1113,7 @@ class RunQueue: else: self.rqexe.finish() - def dump_signatures(self): + def dump_signatures(self, options): done = set() bb.note("Reparsing files to collect dependency data") for task in range(len(self.rqdata.runq_fnid)): @@ -1122,7 +1122,7 @@ class RunQueue: the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.collection.get_file_appends(fn), self.cooker.data) done.add(self.rqdata.runq_fnid[task]) - bb.parse.siggen.dump_sigs(self.rqdata.dataCache) + bb.parse.siggen.dump_sigs(self.rqdata.dataCache, options) return diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index a54357a3f3..a6d28597ed 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -59,7 +59,7 @@ class SignatureGenerator(object): def invalidate_task(self, task, d, fn): bb.build.del_stamp(task, d, fn) - def dump_sigs(self, dataCache): + def dump_sigs(self, dataCache, options): return class SignatureGeneratorBasic(SignatureGenerator): @@ -251,7 +251,7 @@ class SignatureGeneratorBasic(SignatureGenerator): pass raise err - def dump_sigs(self, dataCache): + def dump_sigs(self, dataCache, options): for fn in self.taskdeps: for task in self.taskdeps[fn]: k = fn + "." + task