From 6549f58cd6e22b4c345212237e81e68e12dfcb61 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Dec 2022 13:53:22 +0000 Subject: bitbake: cache/siggen: Fix cache issues with signature handling There is a bug in the current cache code where the restored data structures were "inverted" leading to some very weird issues, not sure how anything worked like that, this patch fixes it. Also fix some issues with multiconfig cache ordering problems by resetting the stream counters when appropriate. (Bitbake rev: cd06beb948eff5eaf2d474f5b127d51a61b0b2ef) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cache.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/cache.py') diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index f5b527ba6a..3fc097241a 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -311,7 +311,7 @@ class SiggenRecipeInfo(RecipeInfoCommon): cls.restore_map[pid] = {} cls.restore_count[pid] = 1 map = cls.restore_map[pid] - for fs, dep, mapnum in deps: + for dep, fs, mapnum in deps: if mapnum: ret[dep] = map[mapnum] else: @@ -759,6 +759,7 @@ class MulticonfigCache(Mapping): loaded = 0 for c in self.__caches.values(): + SiggenRecipeInfo.reset() loaded += c.prepare_cache(progress) previous_progress = current_progress -- cgit v1.2.3-54-g00ecf