bitbake/siggen: Allow generation of siggen data from task context
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
89c7260931
commit
19d9435a32
|
@ -109,10 +109,13 @@ class SignatureGeneratorBasic(SignatureGenerator):
|
||||||
|
|
||||||
def dump_sigtask(self, fn, task, stampbase, runtime):
|
def dump_sigtask(self, fn, task, stampbase, runtime):
|
||||||
k = fn + "." + task
|
k = fn + "." + task
|
||||||
if runtime:
|
if runtime == "customfile":
|
||||||
|
sigfile = stampbase
|
||||||
|
elif runtime:
|
||||||
sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[k]
|
sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[k]
|
||||||
else:
|
else:
|
||||||
sigfile = stampbase + "." + task + ".sigbasedata" + "." + self.basehash[k]
|
sigfile = stampbase + "." + task + ".sigbasedata" + "." + self.basehash[k]
|
||||||
|
|
||||||
data = {}
|
data = {}
|
||||||
data['basewhitelist'] = self.basewhitelist
|
data['basewhitelist'] = self.basewhitelist
|
||||||
data['taskwhitelist'] = self.taskwhitelist
|
data['taskwhitelist'] = self.taskwhitelist
|
||||||
|
@ -125,7 +128,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
|
||||||
data['gendeps'][dep] = self.gendeps[fn][dep]
|
data['gendeps'][dep] = self.gendeps[fn][dep]
|
||||||
data['varvals'][dep] = self.lookupcache[fn][dep]
|
data['varvals'][dep] = self.lookupcache[fn][dep]
|
||||||
|
|
||||||
if runtime:
|
if runtime and runtime != "customfile":
|
||||||
data['runtaskdeps'] = self.runtaskdeps[k]
|
data['runtaskdeps'] = self.runtaskdeps[k]
|
||||||
data['runtaskhashes'] = {}
|
data['runtaskhashes'] = {}
|
||||||
for dep in data['runtaskdeps']:
|
for dep in data['runtaskdeps']:
|
||||||
|
@ -145,6 +148,11 @@ class SignatureGeneratorBasic(SignatureGenerator):
|
||||||
bb.error("The mismatched hashes were %s and %s" % (dataCache.basetaskhash[k], self.basehash[k]))
|
bb.error("The mismatched hashes were %s and %s" % (dataCache.basetaskhash[k], self.basehash[k]))
|
||||||
self.dump_sigtask(fn, task, dataCache.stamp[fn], True)
|
self.dump_sigtask(fn, task, dataCache.stamp[fn], True)
|
||||||
|
|
||||||
|
def dump_this_task(outfile, d):
|
||||||
|
fn = d.getVar("BB_FILENAME", True)
|
||||||
|
task = "do_" + d.getVar("BB_CURRENTTASK", True)
|
||||||
|
bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile")
|
||||||
|
|
||||||
def compare_sigfiles(a, b):
|
def compare_sigfiles(a, b):
|
||||||
p1 = pickle.Unpickler(file(a, "rb"))
|
p1 = pickle.Unpickler(file(a, "rb"))
|
||||||
a_data = p1.load()
|
a_data = p1.load()
|
||||||
|
|
Loading…
Reference in New Issue