diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-09-17 15:22:26 +0800 | 
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-17 22:00:26 +0100 | 
| commit | 280b6d0011f101e7a8edabd34c265b37a2f791ed (patch) | |
| tree | 118f750857a2238837468d899190606222b3660f /meta/lib/oe/sstatesig.py | |
| parent | 7450ba405360d6a2a52652a8f5c8e5838e347048 (diff) | |
| download | poky-280b6d0011f101e7a8edabd34c265b37a2f791ed.tar.gz | |
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.
(From OE-Core rev: f6a39cc957bf85ff43513f0b76afc3b2c9c906b6)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/sstatesig.py')
| -rw-r--r-- | meta/lib/oe/sstatesig.py | 2 | 
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): | |||
| 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 | t = 't-' + t.replace('_', '-') | 
| 150 | if t not in types: | 150 | if t not in types: | 
| 151 | types[t] = [] | 151 | types[t] = [] | 
| 152 | types[t].append(k) | 152 | types[t].append(k) | 
