diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-26 13:47:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-27 09:42:08 +0000 |
commit | 172095e09f3b0fc0e287aebcf922872475a9991d (patch) | |
tree | faaa65ed4d3f9372b030e605b333271f5e4ff497 /bitbake/lib/bb | |
parent | 774eb753d8f23d5887c476062acced3bb0ac40c7 (diff) | |
download | poky-172095e09f3b0fc0e287aebcf922872475a9991d.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 6 | ||||
-rw-r--r-- | 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: | |||
1040 | if dump: | 1040 | if dump: |
1041 | if 'printdiff' in dump: | 1041 | if 'printdiff' in dump: |
1042 | invalidtasks = self.print_diffscenetasks() | 1042 | invalidtasks = self.print_diffscenetasks() |
1043 | self.dump_signatures() | 1043 | self.dump_signatures(dump) |
1044 | if 'printdiff' in dump: | 1044 | if 'printdiff' in dump: |
1045 | self.write_diffscenetasks(invalidtasks) | 1045 | self.write_diffscenetasks(invalidtasks) |
1046 | self.state = runQueueComplete | 1046 | self.state = runQueueComplete |
@@ -1113,7 +1113,7 @@ class RunQueue: | |||
1113 | else: | 1113 | else: |
1114 | self.rqexe.finish() | 1114 | self.rqexe.finish() |
1115 | 1115 | ||
1116 | def dump_signatures(self): | 1116 | def dump_signatures(self, options): |
1117 | done = set() | 1117 | done = set() |
1118 | bb.note("Reparsing files to collect dependency data") | 1118 | bb.note("Reparsing files to collect dependency data") |
1119 | for task in range(len(self.rqdata.runq_fnid)): | 1119 | for task in range(len(self.rqdata.runq_fnid)): |
@@ -1122,7 +1122,7 @@ class RunQueue: | |||
1122 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.collection.get_file_appends(fn), self.cooker.data) | 1122 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.collection.get_file_appends(fn), self.cooker.data) |
1123 | done.add(self.rqdata.runq_fnid[task]) | 1123 | done.add(self.rqdata.runq_fnid[task]) |
1124 | 1124 | ||
1125 | bb.parse.siggen.dump_sigs(self.rqdata.dataCache) | 1125 | bb.parse.siggen.dump_sigs(self.rqdata.dataCache, options) |
1126 | 1126 | ||
1127 | return | 1127 | return |
1128 | 1128 | ||
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): | |||
59 | def invalidate_task(self, task, d, fn): | 59 | def invalidate_task(self, task, d, fn): |
60 | bb.build.del_stamp(task, d, fn) | 60 | bb.build.del_stamp(task, d, fn) |
61 | 61 | ||
62 | def dump_sigs(self, dataCache): | 62 | def dump_sigs(self, dataCache, options): |
63 | return | 63 | return |
64 | 64 | ||
65 | class SignatureGeneratorBasic(SignatureGenerator): | 65 | class SignatureGeneratorBasic(SignatureGenerator): |
@@ -251,7 +251,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
251 | pass | 251 | pass |
252 | raise err | 252 | raise err |
253 | 253 | ||
254 | def dump_sigs(self, dataCache): | 254 | def dump_sigs(self, dataCache, options): |
255 | for fn in self.taskdeps: | 255 | for fn in self.taskdeps: |
256 | for task in self.taskdeps[fn]: | 256 | for task in self.taskdeps[fn]: |
257 | k = fn + "." + task | 257 | k = fn + "." + task |