aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-02-21 15:23:35 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-26 16:46:25 (GMT)
commit98292d1ef1cb44cf96f0a28fbca6439eda55ce1b (patch)
tree690d4281ddbff9a5ffa88e802b404e285cf342ee
parentc28505d8297d577924edff8c4232c6ffbf51cbe8 (diff)
downloadpoky-98292d1ef1cb44cf96f0a28fbca6439eda55ce1b.zip
poky-98292d1ef1cb44cf96f0a28fbca6439eda55ce1b.tar.gz
poky-98292d1ef1cb44cf96f0a28fbca6439eda55ce1b.tar.bz2
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: 4a97b83d1d48a5df58733058d41b665b9230198f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/build.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 43790a6..1bda5d0 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -505,10 +505,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)