Skip to contentSkip to conversation

Fix for locked sstate code.

PATCH New Randy Witt 1 participant 2 messages Sep 12, 2014

lore
Share & tools
lore

Randy Witt

author
#0 lore raw

PATCH 1/1 Fix for locked sstate code.

When testing out the locked sstate patches submitted by Richard, I noticed that tasks were running that should be locked. This has to do with OVERRIDES as noted in the following patch.

Without this change, it's possible that a large portion of locked items won't actually be locked.

Randy Witt (1):
sstatesig.py: Replace '_'s with '-'s in SSTATE_LOCKEDSIGS* names.

 meta/lib/oe/sstatesig.py | 1 +
 1 file changed, 1 insertion(+)
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 1/1 sstatesig.py: Replace '_'s with '-'s in SSTATE_LOCKEDSIGS* names.

Using underscores in the "types" parts of the variable names can cause unexpected issues with overrides. For example, if you have both SSTATE_LOCKEDSIGS_x86_64 and SSTATE_LOCKEDSIGS_x86_64_i586, and i586 is in OVERRIDES, then you lose all of the contents in SSTATE_LOCKEDSIGS_x86_64 and thus don't get some of the locked sstate.

Using '-'s in the variable names instead, eliminates these issues.

---
 meta/lib/oe/sstatesig.py | 1 +
 1 file changed, 1 insertion(+)
meta/lib/oe/sstatesig.py +1 -0
index add2619..a0bdaad 100644
@@ -136,6 +136,7 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
         for k in self.runtaskdeps:
             fn = k.rsplit(".",1)[0]
             t = self.lockedhashfn[fn].split(" ")[1].split(":")[5]
+            t = t.replace('_', '-')
             if t not in types:
                 types[t] = []
             types[t].append(k)
Signature · 1 line
1.9.3