MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

sstatesig.py: Improve the SIGGEN_LOCKEDSIGS_TASKSIG_CHECK message

Browse Source 
The previous message when signatures didn't match between the metadata
and the locked signatures file, the message output was a bit confusing.

Now the message should be of the form:

The zlib-native:do_install sig is computed to be
53531910a2a7848432da89def942a91a, but the sig is locked to
d25ba9035f7ccb308e51bbe1066e8d27 in SIGGEN_LOCKEDSIGS_t-x86-64

which will hopefully be more useful in understanding the problem.

[YOCTO #9195]

(From OE-Core rev: 49eeabfff8bbea69401db41f7219e29acf47af73)

Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Randy Witt 2016-04-07 16:34:50 -07:00 committed by Richard Purdie
parent 7e902807cb
commit 2431ed7ec6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta/lib/oe/sstatesig.py
View File

@ -65,12 +65,13 @@ def sstate_lockedsigs(d):
sigs = {} sigs = {}
types = (d.getVar("SIGGEN_LOCKEDSIGS_TYPES", True) or "").split() types = (d.getVar("SIGGEN_LOCKEDSIGS_TYPES", True) or "").split()
for t in types: for t in types:
lockedsigs = (d.getVar("SIGGEN_LOCKEDSIGS_%s" % t, True) or "").split() siggen_lockedsigs_var = "SIGGEN_LOCKEDSIGS_%s" % t
lockedsigs = (d.getVar(siggen_lockedsigs_var, True) or "").split()
for ls in lockedsigs: for ls in lockedsigs:
pn, task, h = ls.split(":", 2) pn, task, h = ls.split(":", 2)
if pn not in sigs: if pn not in sigs:
sigs[pn] = {} sigs[pn] = {}
sigs[pn][task] = h sigs[pn][task] = [h, siggen_lockedsigs_var]
return sigs return sigs
class SignatureGeneratorOEBasic(bb.siggen.SignatureGeneratorBasic): class SignatureGeneratorOEBasic(bb.siggen.SignatureGeneratorBasic):
@ -138,14 +139,15 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
if recipename in self.lockedsigs: if recipename in self.lockedsigs:
if task in self.lockedsigs[recipename]: if task in self.lockedsigs[recipename]:
k = fn + "." + task k = fn + "." + task
h_locked = self.lockedsigs[recipename][task] h_locked = self.lockedsigs[recipename][task][0]
var = self.lockedsigs[recipename][task][1]
self.lockedhashes[k] = h_locked self.lockedhashes[k] = h_locked
self.taskhash[k] = h_locked self.taskhash[k] = h_locked
#bb.warn("Using %s %s %s" % (recipename, task, h)) #bb.warn("Using %s %s %s" % (recipename, task, h))
if h != h_locked: if h != h_locked:
self.mismatch_msgs.append('The %s:%s sig (%s) changed, use locked sig %s to instead' self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s'
% (recipename, task, h, h_locked)) % (recipename, task, h, h_locked, var))
return h_locked return h_locked
#bb.warn("%s %s %s" % (recipename, task, h)) #bb.warn("%s %s %s" % (recipename, task, h))