diff options
author | Randy Witt <randy.e.witt@linux.intel.com> | 2014-09-12 11:25:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-17 22:00:26 +0100 |
commit | f9723a36d77d53eb132b31b6869fbe81c8fe6f73 (patch) | |
tree | 5864bef0ee68bcfb0ddc0e6cc48db2b15f63281a | |
parent | abf0e7e53fd645494b545f002762c3ce5ad407d4 (diff) | |
download | poky-f9723a36d77d53eb132b31b6869fbe81c8fe6f73.tar.gz |
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)
(From OE-Core rev: 65f558a6f762fb13224091dc22903b58eeb9b392)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/sstatesig.py | 1 |
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): | |||
146 | for k in self.runtaskdeps: | 146 | for k in self.runtaskdeps: |
147 | fn = k.rsplit(".",1)[0] | 147 | fn = k.rsplit(".",1)[0] |
148 | t = self.lockedhashfn[fn].split(" ")[1].split(":")[5] | 148 | t = self.lockedhashfn[fn].split(" ")[1].split(":")[5] |
149 | t = t.replace('_', '-') | ||
149 | if t not in types: | 150 | if t not in types: |
150 | types[t] = [] | 151 | types[t] = [] |
151 | types[t].append(k) | 152 | types[t].append(k) |