From: Julien Stephan <jstephan@baylibre.com>
To: openembedded-core@lists.openembedded.org
Cc: Julien Stephan <jstephan@baylibre.com>
Subject: [PATCH v4 3/5] sstatesig: add a new info level for SIGGEN_LOCKEDSIGS_TASKSIG_CHECK
Date: Wed, 2 Aug 2023 16:24:30 +0200 [thread overview]
Message-ID: <20230802142432.2296716-4-jstephan@baylibre.com> (raw)
In-Reply-To: <20230802142432.2296716-1-jstephan@baylibre.com>
as of now, SIGGEN_LOCKEDSIGS_TASKSIG_CHECK can take 2 values: "warn" and
"error", displaying respectively a warning or a fatal error message
only when a task is locked and the task signature is different from
the locked one.
The "info" level is introduced to add a "note" message to remind the
user that a recipe is locked even if the signature is equivalent to the
locked one.
The "warn" and "error" level display the warn/error message for each
task having a mismatch of the signature. Doing this with the "info"
level would result in very verbose output if there are several tasks
locked, so the info level will only print once the list of recipes that
have locked signature.
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
meta/lib/oe/sstatesig.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index f943df181e6..90002f67550 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -104,6 +104,7 @@ class SignatureGeneratorOEBasicHashMixIn(object):
self.lockedhashfn = {}
self.machine = data.getVar("MACHINE")
self.mismatch_msgs = []
+ self.lockedsigs_msgs = ""
self.unlockedrecipes = (data.getVar("SIGGEN_UNLOCKED_RECIPES") or
"").split()
self.unlockedrecipes = { k: "" for k in self.unlockedrecipes }
@@ -264,6 +265,12 @@ class SignatureGeneratorOEBasicHashMixIn(object):
warn_msgs = []
error_msgs = []
sstate_missing_msgs = []
+ info_msgs = None
+
+ if self.lockedsigs:
+ self.lockedsigs_msgs = "The following recipes have locked tasks:"
+ for pn in self.lockedsigs:
+ self.lockedsigs_msgs += " %s" % (pn)
for tid in sq_data['hash']:
if tid not in found:
@@ -276,7 +283,9 @@ class SignatureGeneratorOEBasicHashMixIn(object):
% (pn, taskname, sq_data['hash'][tid]))
checklevel = d.getVar("SIGGEN_LOCKEDSIGS_TASKSIG_CHECK")
- if checklevel == 'warn':
+ if checklevel == 'info':
+ info_msgs = self.lockedsigs_msgs
+ if checklevel == 'warn' or checklevel == 'info':
warn_msgs += self.mismatch_msgs
elif checklevel == 'error':
error_msgs += self.mismatch_msgs
@@ -287,6 +296,8 @@ class SignatureGeneratorOEBasicHashMixIn(object):
elif checklevel == 'error':
error_msgs += sstate_missing_msgs
+ if info_msgs:
+ bb.note(info_msgs)
if warn_msgs:
bb.warn("\n".join(warn_msgs))
if error_msgs:
--
2.41.0
next prev parent reply other threads:[~2023-08-02 14:24 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-02 14:24 [PATCH v4 0/5] Add bblock helper scripts Julien Stephan
2023-08-02 14:24 ` [PATCH v4 1/5] bitbake.conf: include bblock.conf Julien Stephan
2023-08-02 14:24 ` [PATCH v4 2/5] bitbake: cooker: add a new function to retrieve task signatures Julien Stephan
2023-08-02 14:44 ` Julien Stephan
2023-08-11 15:16 ` [OE-core] " Richard Purdie
2023-08-22 9:27 ` Julien Stephan
2023-09-14 13:26 ` Richard Purdie
2023-08-02 14:24 ` Julien Stephan [this message]
2023-08-11 15:19 ` [OE-core] [PATCH v4 3/5] sstatesig: add a new info level for SIGGEN_LOCKEDSIGS_TASKSIG_CHECK Richard Purdie
2023-08-02 14:24 ` [PATCH v4 4/5] scripts/bblock: add a script to lock/unlock recipes Julien Stephan
2023-08-02 14:24 ` [PATCH v4 5/5] oeqa/selftest/bblock: add self test for bblock tool Julien Stephan
2023-08-03 2:57 ` [OE-core] [PATCH v4 0/5] Add bblock helper scripts Chen, Qi
2023-08-03 7:19 ` Julien Stephan
2023-08-10 13:21 ` Alexandre Belloni
2023-08-11 8:00 ` Alexandre Belloni
2023-08-11 8:45 ` Alexandre Belloni
2023-09-20 14:20 ` Julien Stephan
2023-09-21 13:11 ` Alexandre Belloni
2023-09-21 14:24 ` Julien Stephan
2023-09-21 21:58 ` Alexandre Belloni
2023-09-22 8:54 ` Julien Stephan
2023-09-22 9:50 ` Alexandre Belloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230802142432.2296716-4-jstephan@baylibre.com \
--to=jstephan@baylibre.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox