From: Peter Kjellerstedt <pkj@axis.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH 1/3] insane.bbclass: Make do_qa_patch() depend on if patch-fuzz is in ERROR_QA
Date: Sat, 2 Apr 2022 01:59:04 +0200 [thread overview]
Message-ID: <20220401235906.652-1-pkj@axis.com> (raw)
Adding "patch-fuzz" to ERROR_QA should trigger the patch tasks to
rerun to make sure any already existing fuzz is caught. This is
achieved by using bb.utils.filter() to see if "patch-fuzz" is in
ERROR_QA/WARN_QA as it adds whether the filtered strings are set or
not to the task hash.
Since the mechanism used above ignores that a variable is excluded
(which WARN_QA is), the value for whether "patch-fuzz" is in WARN_QA
or not has to be explicitly excluded so that adding/removing
"patch-fuzz" to/from WARN_QA does not trigger the patch tasks to
rerun.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
meta/classes/insane.bbclass | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 0deebdb148..873706952b 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1142,6 +1142,8 @@ python do_qa_staging() {
oe.qa.exit_with_message_if_errors("QA staging was broken by the package built above", d)
}
+do_qa_patch[vardepvalueexclude] .= "|WARN_QA{patch-fuzz} = Set"
+do_qa_patch[vardepvalueexclude] .= "|WARN_QA{patch-fuzz} = Unset"
python do_qa_patch() {
import subprocess
@@ -1182,9 +1184,9 @@ python do_qa_patch() {
msg += " devtool modify %s\n" % d.getVar('PN')
msg += " devtool finish --force-patch-refresh %s <layer_path>\n\n" % d.getVar('PN')
msg += "Don't forget to review changes done by devtool!\n"
- if 'patch-fuzz' in d.getVar('ERROR_QA'):
+ if bb.utils.filter('ERROR_QA', 'patch-fuzz', d):
bb.error(msg)
- elif 'patch-fuzz' in d.getVar('WARN_QA'):
+ elif bb.utils.filter('WARN_QA', 'patch-fuzz', d):
bb.warn(msg)
msg = "Patch log indicates that patches do not apply cleanly."
oe.qa.handle_error("patch-fuzz", msg, d)
next reply other threads:[~2022-04-04 18:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-01 23:59 Peter Kjellerstedt [this message]
2022-04-01 23:59 ` [PATCH 2/3] bitbake.conf: Remove ERROR_QA from BB_HASHEXCLUDE_COMMON Peter Kjellerstedt
2022-04-01 23:59 ` [PATCH 3/3] insane.bbclass: Make changes to QA_EMPTY_DIRS trigger package_qa to rerun Peter Kjellerstedt
2022-04-02 6:52 ` [OE-core] [PATCH 1/3] insane.bbclass: Make do_qa_patch() depend on if patch-fuzz is in ERROR_QA Richard Purdie
[not found] ` <16E201CA0017277F.4558@lists.openembedded.org>
2022-04-02 8:51 ` Richard Purdie
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=20220401235906.652-1-pkj@axis.com \
--to=pkj@axis.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.