From patchwork Fri Apr 1 23:59:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 6204 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9F2FC54F3B for ; Mon, 4 Apr 2022 18:46:44 +0000 (UTC) Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mx.groups.io with SMTP id smtpd.web08.6322.1648857550347391921 for ; Fri, 01 Apr 2022 16:59:11 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@axis.com header.s=axis-central1 header.b=RgBJ323/; spf=pass (domain: axis.com, ip: 195.60.68.17, mailfrom: peter.kjellerstedt@axis.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1648857550; x=1680393550; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=jNA30nfR1sdaXKQxW9bnuu/v0GD3QDU48qBq2n+Us60=; b=RgBJ323/U6qQ4f8pEUZP0tLYJN2uZgYQVAC1iTyaQjk+/c4bhixgKLt4 AU3smVnuTsf7Fk0uvGR33Wb/+LDXauSkLWg7ekNYbh3PjuXIH1WovA6gn zyOQWtwRZPYVxR4WCRjykFqhuODxdUiQBtANPD/MbZ+MTbBJyJKQPD34J rqVQC4HLvgwgKwYuPQNHvItQP6e5u+7j8VApHzRUIfEysVi5Kh41kqwd1 zX3IAXdVbFnyJNijMGpWDWFmEYI47xezBeGoaKjL0MY3lz2HAs4DfL38k iJpG8GhJFBK87DtkbWKh+F80LkG7xGf8UzsSOzb+OEFC/TC1MBAUulH+z Q==; From: Peter Kjellerstedt To: 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 Message-ID: <20220401235906.652-1-pkj@axis.com> X-Mailer: git-send-email 2.21.3 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 04 Apr 2022 18:46:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163947 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 --- 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 \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) From patchwork Fri Apr 1 23:59:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 6205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4328C54F3E for ; Mon, 4 Apr 2022 18:46:44 +0000 (UTC) Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mx.groups.io with SMTP id smtpd.web08.6322.1648857550347391921 for ; Fri, 01 Apr 2022 16:59:12 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@axis.com header.s=axis-central1 header.b=YaOG6aVY; spf=pass (domain: axis.com, ip: 195.60.68.17, mailfrom: peter.kjellerstedt@axis.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1648857551; x=1680393551; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=VClYiWzpBdwFwor5U2lqXfQK9VE4VWPWe+y+ZCd4MfM=; b=YaOG6aVYHRLdDl+I7zHqlFbmXJy1b8O8bzT1oCmEqrP8By11iYez2cMm cGwBMuH+tRyvEncFcLtzTKgRoAbBwN4CaeTytf1LDpca5bnitw/dx72yY noWhnzRU8/KnSmVzS3UzhL66IkjeKD2A5X3P0E1LGyiL8EKgIIiFKZP+R UpzkJvThYBn58mXYqnWc162MBx8+tgxORpS/XYhsjOXgyYQBTcqAC6hK8 DfEYAF12s/9wTDm/1bddX4D3jSlK7PWLusooa7MTQDBYwsTusUxm0ijag wdofO0pNPQaSVUw++xbYiuYuLVmWX5iXVBkhVkrqOOz9aBsVk9IuKnWgF A==; From: Peter Kjellerstedt To: Subject: [PATCH 2/3] bitbake.conf: Remove ERROR_QA from BB_HASHEXCLUDE_COMMON Date: Sat, 2 Apr 2022 01:59:05 +0200 Message-ID: <20220401235906.652-2-pkj@axis.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20220401235906.652-1-pkj@axis.com> References: <20220401235906.652-1-pkj@axis.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 04 Apr 2022 18:46:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163949 If a QA test is added to ERROR_QA, all package_qa tasks should rerun to make sure any already existing errors are caught. Signed-off-by: Peter Kjellerstedt --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 7705415a4f..3b8760a3f8 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -949,7 +949,7 @@ BB_HASHEXCLUDE_COMMON ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ STAMPS_DIR PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_NOHASHDIR LICENSE_PATH SDKPKGSUFFIX \ - WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ + WARN_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \ SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \ SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE GIT_CEILING_DIRECTORIES \ From patchwork Fri Apr 1 23:59:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 6203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC475C54F3D for ; Mon, 4 Apr 2022 18:46:44 +0000 (UTC) Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by mx.groups.io with SMTP id smtpd.web08.6323.1648857550885986161 for ; Fri, 01 Apr 2022 16:59:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@axis.com header.s=axis-central1 header.b=XC16NLki; spf=pass (domain: axis.com, ip: 195.60.68.18, mailfrom: peter.kjellerstedt@axis.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1648857551; x=1680393551; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=E1mUcrluSyuM+oLV1IctkoJoACPW0pkLZ8bTMU80mcY=; b=XC16NLkiP0YUbWYRI0ETQFhhFdmAdTy5r14aRjUQwvhKXGc1F9LfBN/z Ee4ijM57A8wvDBhSQPes5a4OFZo25Q+BEBRuLz7e9XoazzWp1tNsdsaX8 1BYLGqsiuBBJLBaxkcdide18YunYDdnTGoGVfgg9dRoIhPbAeQwsL5xiL KF/6pTxAr43tCAJCfZz61LmZ8luHU0qoy9nyIKytZ6LXDUxwEP4LIsIby fJIZPx/dcEkIScn12lTJYMXrBBJfDYxNRXqS/MijLGzvsp5d79cpVrFHI Mx+9VgYacDVn9mOAUETKGxhqxVLulAVVh7Wa7+NExc93hY9UC2rK+gOc5 Q==; From: Peter Kjellerstedt To: Subject: [PATCH 3/3] insane.bbclass: Make changes to QA_EMPTY_DIRS trigger package_qa to rerun Date: Sat, 2 Apr 2022 01:59:06 +0200 Message-ID: <20220401235906.652-3-pkj@axis.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20220401235906.652-1-pkj@axis.com> References: <20220401235906.652-1-pkj@axis.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 04 Apr 2022 18:46:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163948 If "empty-dirs" is in ERROR_QA, then changes to QA_EMPTY_DIRS should trigger the package_qa tasks to be rerun. Signed-off-by: Peter Kjellerstedt --- meta/classes/insane.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 873706952b..ca67a70c43 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1117,6 +1117,7 @@ python do_package_qa () { # binutils is used for most checks, so need to set as dependency # POPULATESYSROOTDEPS is defined in staging class. do_package_qa[depends] += "${POPULATESYSROOTDEPS}" +do_package_qa[vardeps] = "${@bb.utils.contains('ERROR_QA', 'empty-dirs', 'QA_EMPTY_DIRS', '', d)}" do_package_qa[vardepsexclude] = "BB_TASKDEPDATA" do_package_qa[rdeptask] = "do_packagedata" addtask do_package_qa after do_packagedata do_package before do_build