summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2014-09-12 11:25:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-17 22:00:05 +0100
commit65f558a6f762fb13224091dc22903b58eeb9b392 (patch)
tree8ac389e522d381f2b36786d13e83e5d9e5b6a352
parent1683815695f39d4bad352348913f927ac8a1bcf5 (diff)
downloadopenembedded-core-contrib-65f558a6f762fb13224091dc22903b58eeb9b392.tar.gz
openembedded-core-contrib-65f558a6f762fb13224091dc22903b58eeb9b392.tar.bz2
openembedded-core-contrib-65f558a6f762fb13224091dc22903b58eeb9b392.zip
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@linuxfoundation.org>
-rw-r--r--meta/lib/oe/sstatesig.py1
1 files changed, 1 insertions, 0 deletions
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)