From: Hongxu Jia Date: Wed, 17 Sep 2014 07:22:26 +0000 (+0800) Subject: sstatesig: fix overrides behaviour to remove SIGGEN_LOCKEDSIGS_i586 X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~32375 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6a39cc957bf85ff43513f0b76afc3b2c9c906b6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 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 --- diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 65dbac16ec8..af7617ee61c 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)