From patchwork Thu Feb 21 15:23:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel] build.py: avoid deleting taint files when writing stamps Date: Thu, 21 Feb 2013 15:23:35 -0000 From: Paul Eggleton X-Patchwork-Id: 44979 Message-Id: <1361460215-30292-1-git-send-email-paul.eggleton@linux.intel.com> To: bitbake-devel@lists.openembedded.org The stamp cleaning process that occurs before writing out new stamps for a task was deleting taint files as well. This resulted in tasks that were forcibly re-executed using the -f or -C command line options to have their previous output restored from shared state when called upon a second time, because the taint value was no longer incorporated into the task signature and thus it was reverting to its previous value. This also affected the kernel menuconfig command in OE-Core. Note that the taint file *is* still deleted when doing -c clean, which is the desired behaviour. Fixes [YOCTO #3919]. Signed-off-by: Paul Eggleton --- lib/bb/build.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bb/build.py b/lib/bb/build.py index 5f5a007..d91ff53 100644 --- a/lib/bb/build.py +++ b/lib/bb/build.py @@ -519,10 +519,13 @@ def make_stamp(task, d, file_name = None): """ cleanmask = stamp_cleanmask_internal(task, d, file_name) for mask in cleanmask: - # Preserve sigdata files in the stamps directory for name in glob.glob(mask): + # Preserve sigdata files in the stamps directory if "sigdata" in name: continue + # Preserve taint files in the stamps directory + if name.endswith('.taint'): + continue os.unlink(name) stamp = stamp_internal(task, d, file_name)