summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/siggen.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-03 15:48:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-03 22:50:17 +0100
commitaf5f423887d1c41cf7279f6e537077726ae13082 (patch)
treeb79c6e819583504bc00362ba49106cc2ae4e0094 /bitbake/lib/bb/siggen.py
parent47e9e125d7378139de1d9180a8b24aa9d088f4f6 (diff)
downloadopenembedded-core-contrib-af5f423887d1c41cf7279f6e537077726ae13082.tar.gz
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>
Diffstat (limited to 'bitbake/lib/bb/siggen.py')
-rw-r--r--bitbake/lib/bb/siggen.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 1fa7b09272..88fc0f1d5c 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -238,9 +238,12 @@ class SignatureGeneratorBasic(SignatureGenerator):
bb.fetch2.fetcher_parse_done()
def dump_sigtask(self, fn, task, stampbase, runtime):
+
k = fn + "." + task
- if runtime == "customfile":
+ referencestamp = stampbase
+ if isinstance(runtime, str) and runtime.startswith("customfile"):
sigfile = stampbase
+ referencestamp = runtime[11:]
elif runtime and k in self.taskhash:
sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[k]
else:
@@ -271,7 +274,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
data['runtaskhashes'][dep] = self.taskhash[dep]
data['taskhash'] = self.taskhash[k]
- taint = self.read_taint(fn, task, stampbase)
+ taint = self.read_taint(fn, task, referencestamp)
if taint:
data['taint'] = taint
@@ -341,7 +344,8 @@ def dump_this_task(outfile, d):
import bb.parse
fn = d.getVar("BB_FILENAME", 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):
b = a.rsplit("/", 2)[1] + a.rsplit("/", 2)[2]