summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-09-17 15:22:26 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-17 22:00:05 +0100
commitf6a39cc957bf85ff43513f0b76afc3b2c9c906b6 (patch)
tree264a8e7f4bff4b8e956ec3c509b66402820e3a2c
parent65020364bd089afbb83cd216e7ae2f837077bfc5 (diff)
downloadopenembedded-core-contrib-f6a39cc957bf85ff43513f0b76afc3b2c9c906b6.tar.gz
openembedded-core-contrib-f6a39cc957bf85ff43513f0b76afc3b2c9c906b6.tar.bz2
openembedded-core-contrib-f6a39cc957bf85ff43513f0b76afc3b2c9c906b6.zip
sstatesig: fix overrides behaviour to remove SIGGEN_LOCKEDSIGS_i586
Require a sig file which SIGGEN_LOCKEDSIGS_i586 is not null, but the actual SIGGEN_LOCKEDSIGS_i586 is null. Invoking 'bitbake -e' and we got: ... 3935 # $SIGGEN_LOCKEDSIGS_i586 [2 operations] 3936 # set /path/to/locked-sigs.inc:8576 3938 # del data_smart.py:406 [finalize] 3939 # "" ... It was caused by the following commit: ... (Bitbake rev: 899d45b90061eb3cf3e71029072eee42cd80930c) Author: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Tue May 31 23:52:50 2011 +0100 bitbake/data_smart: Change overrides behaviour to remove expanded variables from the datastore ... We add prefix 't-' to type to workaround the overrides behaviour. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--meta/lib/oe/sstatesig.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 65dbac16ec..af7617ee61 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -146,7 +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('_', '-')
+ t = 't-' + t.replace('_', '-')
if t not in types:
types[t] = []
types[t].append(k)