From be78283e6cd7bea2eb1a5c5b797f1a6315468da5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 4 Jun 2013 09:59:37 +0100 Subject: bitbake: lib/bb/cache.py: invalidate cache when file checksum entry no longer exists Go through the cached list of file checksums and check if any of the files no longer exist; if any are missing then invalidate the cached recipe, which will force it to be reparsed and thus force the list of files to be collected again. This prevents a warning when moving a file to a different location that is still picked up by the recipe, e.g. moving a file from a "files" subdirectory to one named with the recipe name (${BPN}). Fixes [YOCTO #4474]. (Bitbake rev: e1aa103593c46612c4d9000524174983b5994dc9) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/cache.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'bitbake') diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 9e89742235..eee83b7d09 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -524,6 +524,15 @@ class Cache(object): self.remove(fn) return False + if hasattr(info_array[0], 'file_checksums'): + for _, fl in info_array[0].file_checksums.items(): + for f in fl.split(): + if not os.path.exists(f): + logger.debug(2, "Cache: %s's file checksum list file %s was removed", + fn, f) + self.remove(fn) + return False + if appends != info_array[0].appends: logger.debug(2, "Cache: appends for %s changed", fn) logger.debug(2, "%s to %s" % (str(appends), str(info_array[0].appends))) -- cgit v1.2.3-54-g00ecf