[oe-commits] Randy Witt : sstatesig.py: Replace '_'s with '-' s in SSTATE_LOCKEDSIGS* names.

git at git.openembedded.org git at git.openembedded.org
Wed Sep 17 21:01:06 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: 65f558a6f762fb13224091dc22903b58eeb9b392
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=65f558a6f762fb13224091dc22903b58eeb9b392

Author: Randy Witt <randy.e.witt at linux.intel.com>
Date:   Fri Sep 12 11:25:12 2014 -0700

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.

(From OE-Core rev: 6662c412a949a9f6b602c848e6303b19db7e5272)

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

---

 meta/lib/oe/sstatesig.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index a108761..65dbac1 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -146,6 +146,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)



More information about the Openembedded-commits mailing list