[oe-commits] Hongxu Jia : sstatesig: Only dump incremental locked signatures

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 68f33098f1cd9726d7b1eba270b3d9ba50b82a52
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=68f33098f1cd9726d7b1eba270b3d9ba50b82a52

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Wed Sep 17 14:37:33 2014 +0800

sstatesig: Only dump incremental locked signatures

The idea of incremental sig is:

New sig file = Old sig file (if available) + New sig items in current build.

Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>

---

 meta/lib/oe/sstatesig.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index af7617e..56aa66a 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -153,15 +153,19 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
 
         with open(sigfile, "w") as f:
             for t in types:
-                f.write('SIGGEN_LOCKEDSIGS_%s = "\\\n' % t)
+                f.write('SIGGEN_LOCKEDSIGS_%s += "\\\n' % t)
                 types[t].sort()
                 sortedk = sorted(types[t], key=lambda k: self.lockedpnmap[k.rsplit(".",1)[0]])
                 for k in sortedk:
                     fn = k.rsplit(".",1)[0]
+                    pn = self.lockedpnmap[fn]
                     task = k.rsplit(".",1)[1]
                     if k not in self.taskhash:
                         continue
-                    f.write("    " + self.lockedpnmap[fn] + ":" + task + ":" + self.taskhash[k] + " \\\n")
+                    if pn in self.lockedsigs and task in self.lockedsigs[pn] and self.hashtask[k] == self.lockedsigs[pn][task]:
+                        continue
+                    sigentry = pn + ":" + task + ":" + self.taskhash[k]
+                    f.write("    " + sigentry + " \\\n")
                 f.write('    "\n')
             f.write('SIGGEN_LOCKEDSIGS_TYPES_%s = "%s"' % (self.machine, " ".join(types.keys())))