bitbake: siggen: Ensure tainted stamps are accounted for with writing custom stamps
sstate.bbclass for example writes siginfo files to a separate location but we need to read taint data from the standard path. (Bitbake rev: da444c9761ee15a59ea8880e3f812a5d3f1a1aaa) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
47e9e125d7
commit
af5f423887
|
@ -238,9 +238,12 @@ class SignatureGeneratorBasic(SignatureGenerator):
|
||||||
bb.fetch2.fetcher_parse_done()
|
bb.fetch2.fetcher_parse_done()
|
||||||
|
|
||||||
def dump_sigtask(self, fn, task, stampbase, runtime):
|
def dump_sigtask(self, fn, task, stampbase, runtime):
|
||||||
|
|
||||||
k = fn + "." + task
|
k = fn + "." + task
|
||||||
if runtime == "customfile":
|
referencestamp = stampbase
|
||||||
|
if isinstance(runtime, str) and runtime.startswith("customfile"):
|
||||||
sigfile = stampbase
|
sigfile = stampbase
|
||||||
|
referencestamp = runtime[11:]
|
||||||
elif runtime and k in self.taskhash:
|
elif runtime and k in self.taskhash:
|
||||||
sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[k]
|
sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[k]
|
||||||
else:
|
else:
|
||||||
|
@ -271,7 +274,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
|
||||||
data['runtaskhashes'][dep] = self.taskhash[dep]
|
data['runtaskhashes'][dep] = self.taskhash[dep]
|
||||||
data['taskhash'] = self.taskhash[k]
|
data['taskhash'] = self.taskhash[k]
|
||||||
|
|
||||||
taint = self.read_taint(fn, task, stampbase)
|
taint = self.read_taint(fn, task, referencestamp)
|
||||||
if taint:
|
if taint:
|
||||||
data['taint'] = taint
|
data['taint'] = taint
|
||||||
|
|
||||||
|
@ -341,7 +344,8 @@ def dump_this_task(outfile, d):
|
||||||
import bb.parse
|
import bb.parse
|
||||||
fn = d.getVar("BB_FILENAME", True)
|
fn = d.getVar("BB_FILENAME", True)
|
||||||
task = "do_" + d.getVar("BB_CURRENTTASK", True)
|
task = "do_" + d.getVar("BB_CURRENTTASK", True)
|
||||||
bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile")
|
referencestamp = bb.build.stamp_internal(task, d, None, True)
|
||||||
|
bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile:" + referencestamp)
|
||||||
|
|
||||||
def clean_basepath(a):
|
def clean_basepath(a):
|
||||||
b = a.rsplit("/", 2)[1] + a.rsplit("/", 2)[2]
|
b = a.rsplit("/", 2)[1] + a.rsplit("/", 2)[2]
|
||||||
|
|
Loading…
Reference in New Issue