From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 6 Jan 2020 13:14:17 +0000 (+0000)
Subject: scripts/gen-lockedsig-cache: Only look at new format sstate objects
X-Git-Tag: uninative-2.8~640
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=610b314ddc757e6ac8ba4d47921aee1f2f35df97;p=openembedded-core.git

scripts/gen-lockedsig-cache: Only look at new format sstate objects

We can have sstate directories which are mixtures of old and new layout entries.
Only use the new format ones since these are the only ones bitbake itself will
look at.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/gen-lockedsig-cache b/scripts/gen-lockedsig-cache
index 6a7d285910..cd8f9a4356 100755
--- a/scripts/gen-lockedsig-cache
+++ b/scripts/gen-lockedsig-cache
@@ -80,13 +80,10 @@ for s in sigs:
     prefix = s[:2]
     prefix2 = s[2:4]
     if prefix not in sstate_content_cache:
-        sstate_content_cache[prefix] = build_sha_cache(prefix)
+        sstate_content_cache[prefix] = {}
     if prefix2 not in sstate_content_cache[prefix]:
         sstate_content_cache[prefix][prefix2] = build_sha_cache(prefix + "/" + prefix2)
 
-    if s in sstate_content_cache[prefix]:
-        for f in sstate_content_cache[prefix][s]:
-            files.add(f)
     if s in sstate_content_cache[prefix][prefix2]:
         for f in sstate_content_cache[prefix][prefix2][s]:
             files.add(f)