]> code.ossystems Code Review - openembedded-core.git/commitdiff
scripts/gen-lockedsig-cache: Only look at new format sstate objects
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 6 Jan 2020 13:14:17 +0000 (13:14 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 6 Jan 2020 23:53:55 +0000 (23:53 +0000)
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>
scripts/gen-lockedsig-cache

index 6a7d285910465abd4d57fb17920d5126edd63945..cd8f9a4356dd794eabc0c61f3dc277b345ae202b 100755 (executable)
@@ -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)