From 406cb9920fad57a23d2139f657c41598eb5087bf Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 21 Feb 2013 15:23:35 +0000 Subject: bitbake: build.py: avoid deleting taint files when writing stamps 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]. (Bitbake rev: e6db0ee31178d4386802e720d75303ec7dc21519) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/build.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 5f5a007196..d91ff53fcf 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/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) -- cgit v1.2.3-54-g00ecf