From 65f558a6f762fb13224091dc22903b58eeb9b392 Mon Sep 17 00:00:00 2001 From: Randy Witt Date: Fri, 12 Sep 2014 11:25:12 -0700 Subject: 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 --- 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 a108761972..65dbac16ec 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) -- cgit 1.2.3-korg