[oe-commits] [bitbake] branch master-next updated: siggen: Ensure tainted stamps are accounted for with writing custom stamps
git at git.openembedded.org
git at git.openembedded.org
Sun Apr 3 14:54:33 UTC 2016
rpurdie pushed a commit to branch master-next
in repository bitbake.
The following commit(s) were added to refs/heads/master-next by this push:
new da444c9 siggen: Ensure tainted stamps are accounted for with writing custom stamps
da444c9 is described below
commit da444c9761ee15a59ea8880e3f812a5d3f1a1aaa
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sun Apr 3 15:48:30 2016 +0100
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/bb/siggen.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 1fa7b09..88fc0f1 100644
--- a/lib/bb/siggen.py
+++ b/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]
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list