From 7ae1d4844d9d3a76f86ef32c5a794e51e334e588 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 18 Jun 2014 17:59:39 +0100 Subject: build.py: Ensure shared work siginfo files are written to the correct location Right now shared work signature data is saved to the non-shared directory which is confusing to everyone including bitbake. Whilst its messy, extra the stampbase data instead, which ensures the sig data is written to the correct location alongside its corresponding stamp file. Signed-off-by: Richard Purdie --- lib/bb/build.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/bb/build.py b/lib/bb/build.py index 32022d808..dcd42ef8c 100644 --- a/lib/bb/build.py +++ b/lib/bb/build.py @@ -506,7 +506,7 @@ def exec_task(fn, task, d, profile = False): event.fire(failedevent, d) return 1 -def stamp_internal(taskname, d, file_name): +def stamp_internal(taskname, d, file_name, baseonly=False): """ Internal stamp helper function Makes sure the stamp directory exists @@ -527,6 +527,9 @@ def stamp_internal(taskname, d, file_name): file_name = d.getVar('BB_FILENAME', True) extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or "" + if baseonly: + return stamp + if not stamp: return @@ -591,8 +594,9 @@ def make_stamp(task, d, file_name = None): # If we're in task context, write out a signature file for each task # as it completes if not task.endswith("_setscene") and task != "do_setscene" and not file_name: + stampbase = stamp_internal(task, d, None, True) file_name = d.getVar('BB_FILENAME', True) - bb.parse.siggen.dump_sigtask(file_name, task, d.getVar('STAMP', True), True) + bb.parse.siggen.dump_sigtask(file_name, task, stampbase, True) def del_stamp(task, d, file_name = None): """ -- cgit 1.2.3-korg