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 <[email protected]> --- 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)
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163947): https://lists.openembedded.org/g/openembedded-core/message/163947 Mute This Topic: https://lists.openembedded.org/mt/90192306/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
