From patchwork Mon Mar 14 14:16:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 5186 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 EFB24C433FE for ; Mon, 14 Mar 2022 14:16:55 +0000 (UTC) Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by mx.groups.io with SMTP id smtpd.web11.26759.1647267411967990641 for ; Mon, 14 Mar 2022 07:16:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@axis.com header.s=axis-central1 header.b=ejhf4jUq; 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=1647267412; x=1678803412; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=jAHzOvUayE7Vt6evNtdDMrd2IKqWDuHtcVJuRIXytm8=; b=ejhf4jUqSsITEOzr0MIWWZaaBwq2E//6BhNxG3pMlVQFPfA99SM4e5J9 wtOzFw2CsHMfTywYfaG0ZJG0Neg88y9BGm8F6DOqLE2EFnGX2CcFTOMtT 9dGd72byLfZtM7HI9FiwTafWoGNcEGUCghoTiJVy+eK+ZmoX45F3yBwfq PDhBdtti5ruyTUw44llPLCxNyTGFa/3sdbu3gpVTpPv4B8sOlpCqSSh1/ zssB4NZaao1HUG6Osni9i7zs//JRkswrhBhoHDLe/FruNOxEHDYgYj8D2 nuNPchNg7HtG87hxj5zOeffJcaTKNaUAF7r+Ydol8ImKiD4pJKzM3fPOo w==; From: Peter Kjellerstedt To: Subject: [PATCH 1/5] create-spdx.bbclass: Remove an unnecessary path from do_create_spdx[dirs] Date: Mon, 14 Mar 2022 15:16:43 +0100 Message-ID: <20220314141647.14807-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, 14 Mar 2022 14:16:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163144 From: Peter Kjellerstedt There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]). Signed-off-by: Peter Kjellerstedt --- meta/classes/create-spdx.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index 5375ef3e34..daf99ca676 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass @@ -600,7 +600,7 @@ python do_create_spdx_setscene () { } addtask do_create_spdx_setscene -do_create_spdx[dirs] = "${SPDXDEPLOY} ${SPDXWORK}" +do_create_spdx[dirs] = "${SPDXWORK}" do_create_spdx[cleandirs] = "${SPDXDEPLOY} ${SPDXWORK}" do_create_spdx[depends] += "${PATCHDEPENDENCY}" do_create_spdx[deptask] = "do_create_spdx" From patchwork Mon Mar 14 14:16:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 5187 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 EE1EAC433F5 for ; Mon, 14 Mar 2022 14:16:55 +0000 (UTC) Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mx.groups.io with SMTP id smtpd.web11.26758.1647267411934991214 for ; Mon, 14 Mar 2022 07:16:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@axis.com header.s=axis-central1 header.b=J9kI9yUR; 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=1647267412; x=1678803412; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=fPPinZ2Fcv5zgnYrBB/0PHy94u3Na5O8pA1zuxduk/c=; b=J9kI9yURthpL802NA7mjvYeJ+hAiIQaKE3a7NhmpjkbCCxnS4jgCzPJ1 VkgRNcj4HGwMMAvN4fkLFhqBAfod8gM7WsrPJEqimA+J71Lpf2LLBZ9dp JaDupFGEtjCMBvAfF0+64QX0v1vhrYUgjIqTAmN8/miA76v2wm2Dp0PGX 2XC6en9B1197tfA3S9QHcdg6gC2FcnbsGqRGeuk99hmeCy1iSSZI2Cipl UYy3wLtAcuoUpqrdOnYVHs9U5DE83EDSY7qBDWh37XnWr20enkjZZl976 Hs3Of8wbXqoFejpSDMBL4h5lEo+uWi5LLMF/Z9c0FkgogxcMkCqFOT8jE g==; From: Peter Kjellerstedt To: Subject: [PATCH 2/5] deploy.bbclass: Remove an unnecessary path from do_deploy[dirs] Date: Mon, 14 Mar 2022 15:16:44 +0100 Message-ID: <20220314141647.14807-2-pkj@axis.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20220314141647.14807-1-pkj@axis.com> References: <20220314141647.14807-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, 14 Mar 2022 14:16:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163143 From: Peter Kjellerstedt There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]). Signed-off-by: Peter Kjellerstedt --- meta/classes/deploy.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/deploy.bbclass b/meta/classes/deploy.bbclass index 737c26122b..7fbffe996b 100644 --- a/meta/classes/deploy.bbclass +++ b/meta/classes/deploy.bbclass @@ -7,6 +7,6 @@ python do_deploy_setscene () { sstate_setscene(d) } addtask do_deploy_setscene -do_deploy[dirs] = "${DEPLOYDIR} ${B}" +do_deploy[dirs] = "${B}" do_deploy[cleandirs] = "${DEPLOYDIR}" do_deploy[stamp-extra-info] = "${MACHINE_ARCH}" From patchwork Mon Mar 14 14:16:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 5189 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 D53F1C433FE for ; Mon, 14 Mar 2022 14:16:59 +0000 (UTC) Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by mx.groups.io with SMTP id smtpd.web11.26759.1647267411967990641 for ; Mon, 14 Mar 2022 07:16:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@axis.com header.s=axis-central1 header.b=ZJBlCpEr; 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=1647267415; x=1678803415; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=+YnJcblMQjhSfjGe9tDVGsSjkXTJ9Upp4V4K0Romrj0=; b=ZJBlCpEr0D2I67ULmKWuoQKRQMr23PiY2bmUiEIEagDyyngmacSifOfg iAare0dBIFDR0TXLZfcHJywlU7AbmAhE8ZYvDidmNBfbMxd9HszV8Bf9m csB6GVdPocsrw8a90mtxsoOr725L2nwdclBnRYfc86dzEXR7jpp0D0Vn0 j2i9Tl0hrlpSAixjbIa3SZFE2a0rBP35uBU64lFS9m/TPfl745fAvE3Kb glJze3wmgVefc2KGf6Vf+4IfOl8NUrzmcbQxS0x4eivDKJVwal0RLMGpJ c439JeCjgV1opSycmcW7+7NLoi/wHnXS0nW0ZEta7CFSv5fjMYusWbwzn g==; From: Peter Kjellerstedt To: Subject: [PATCH 3/5] image.bbclass: Remove two unnecessary paths from do_rootfs[dirs] Date: Mon, 14 Mar 2022 15:16:45 +0100 Message-ID: <20220314141647.14807-3-pkj@axis.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20220314141647.14807-1-pkj@axis.com> References: <20220314141647.14807-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, 14 Mar 2022 14:16:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163146 From: Peter Kjellerstedt There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]). Signed-off-by: Peter Kjellerstedt --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index eb192057c2..7f1f6f80a4 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -252,7 +252,7 @@ fakeroot python do_rootfs () { progress_reporter.finish() } -do_rootfs[dirs] = "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${TOPDIR}" +do_rootfs[dirs] = "${TOPDIR}" do_rootfs[cleandirs] += "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${S}" do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" addtask rootfs after do_prepare_recipe_sysroot From patchwork Mon Mar 14 14:16:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 5188 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 D4D8EC433F5 for ; Mon, 14 Mar 2022 14:16:58 +0000 (UTC) Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by mx.groups.io with SMTP id smtpd.web10.26589.1647267417033193989 for ; Mon, 14 Mar 2022 07:16:58 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@axis.com header.s=axis-central1 header.b=aSHM3Ie8; 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=1647267417; x=1678803417; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=CgmF6Nk/0ApyFtt3hK7kQBlyC6iRZF+Wpkig+Vp1Ps8=; b=aSHM3Ie8D1ZLBEmR2yEI86xuwx9A40bsO5YyiSBZ7EejGOMVAR6nLdRj VFfP37HKE4+mWkVbcDiINYGe+npWmgkzNMqU0j31WYuHVEUkL1hzIsoQh wSZKNDOGntwIRJq13EvQ2zro+WADO9GXcXDa5RuR4bxvtKRv0Mouzw+8v KvWVpk65+VXPvnixrBjPjshviBNp4KrKacqn/33zS3JNumtD40GVskLN9 CPhZ4LLDJSNnKIyf70j+teSbvlgbYCXPFnA86WQm64xJnxQlEvUd4rI0p WkorHvq6uNNPhzIHwn8CWTC8yfgp3Nq9x58KAWpOfylXWaNvpvq56D+KA g==; From: Peter Kjellerstedt To: Subject: [PATCH 4/5] package.bbclass: Remove an unnecessary path from do_package[dirs] Date: Mon, 14 Mar 2022 15:16:46 +0100 Message-ID: <20220314141647.14807-4-pkj@axis.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20220314141647.14807-1-pkj@axis.com> References: <20220314141647.14807-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, 14 Mar 2022 14:16:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163145 From: Peter Kjellerstedt There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]). Signed-off-by: Peter Kjellerstedt --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index f822258150..e71daafe94 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -2464,7 +2464,7 @@ python do_package () { oe.qa.exit_if_errors(d) } -do_package[dirs] = "${SHLIBSWORKDIR} ${PKGDESTWORK} ${D}" +do_package[dirs] = "${SHLIBSWORKDIR} ${D}" do_package[vardeps] += "${PACKAGEBUILDPKGD} ${PACKAGESPLITFUNCS} ${PACKAGEFUNCS} ${@gen_packagevar(d)}" addtask package after do_install From patchwork Mon Mar 14 14:16:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 5190 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 D560DC4332F for ; Mon, 14 Mar 2022 14:17:00 +0000 (UTC) Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by mx.groups.io with SMTP id smtpd.web10.26589.1647267417033193989 for ; Mon, 14 Mar 2022 07:17:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@axis.com header.s=axis-central1 header.b=DZcgNYZ2; 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=1647267418; x=1678803418; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=r5SXOSLOpMbHjfteD+O7W+mWSOPH+42W1aowYMMccVg=; b=DZcgNYZ2fqp6COTfQ0m3nSx6OlnlV4jpiHdPyaHnaEevkRjUaXMWR4uw TRi1S3RKxI/3zhOLF1CYB4A4Tni85EAfZPQNpYE2E1BANUZbDL8XA7c6X 5wDwOC0T5BNVGL+MFn/MPvu3wD/0adTYZ8WXZJatKeJ38ffF/jqYbXE9x JcTHuLxe6ahCBV1PJg4kqbOGsOftghntZ4DTeN9eaMWpZQX+78GR67BR8 Yf9PnZCfaXUE+7ZQiFvvbFlS4UpsgRCLULn1qkt1G+/VbfrvbZjnoOEFV Xvd0cbLTqnmbqJsRz30wgVL3suBAOnXGUqVKNM+mmO302mT0/xYecAXsY Q==; From: Peter Kjellerstedt To: Subject: [PATCH 5/5] go: Remove three unnecessary paths from do_compile[dirs] Date: Mon, 14 Mar 2022 15:16:47 +0100 Message-ID: <20220314141647.14807-5-pkj@axis.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20220314141647.14807-1-pkj@axis.com> References: <20220314141647.14807-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, 14 Mar 2022 14:17:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163147 From: Peter Kjellerstedt There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]). Signed-off-by: Peter Kjellerstedt --- meta/recipes-devtools/go/go-cross-canadian.inc | 1 - meta/recipes-devtools/go/go-cross.inc | 1 - meta/recipes-devtools/go/go-crosssdk.inc | 1 - meta/recipes-devtools/go/go-native_1.17.8.bb | 1 - meta/recipes-devtools/go/go-runtime.inc | 1 - meta/recipes-devtools/go/go-target.inc | 1 - 6 files changed, 6 deletions(-) diff --git a/meta/recipes-devtools/go/go-cross-canadian.inc b/meta/recipes-devtools/go/go-cross-canadian.inc index d49250a8e2..c1aa987427 100644 --- a/meta/recipes-devtools/go/go-cross-canadian.inc +++ b/meta/recipes-devtools/go/go-cross-canadian.inc @@ -27,7 +27,6 @@ do_compile() { ./make.bash --host-only --no-banner cd ${B} } -do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg" do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg" diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc index 3d5803bf07..a0fbdbe3b9 100644 --- a/meta/recipes-devtools/go/go-cross.inc +++ b/meta/recipes-devtools/go/go-cross.inc @@ -17,7 +17,6 @@ do_compile() { ./make.bash --host-only --no-banner cd ${B} } -do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg" do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg" make_wrapper() { diff --git a/meta/recipes-devtools/go/go-crosssdk.inc b/meta/recipes-devtools/go/go-crosssdk.inc index f0bec79719..cd23cca2fe 100644 --- a/meta/recipes-devtools/go/go-crosssdk.inc +++ b/meta/recipes-devtools/go/go-crosssdk.inc @@ -13,7 +13,6 @@ do_compile() { ./make.bash --host-only --no-banner cd ${B} } -do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg" do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg" make_wrapper() { diff --git a/meta/recipes-devtools/go/go-native_1.17.8.bb b/meta/recipes-devtools/go/go-native_1.17.8.bb index ffe4ef3523..76c0ab73a6 100644 --- a/meta/recipes-devtools/go/go-native_1.17.8.bb +++ b/meta/recipes-devtools/go/go-native_1.17.8.bb @@ -27,7 +27,6 @@ do_compile() { ./make.bash ${GOMAKEARGS} cd ${B} } -do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin" do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin" make_wrapper() { diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index ccb86d4fe9..e18339cddb 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc @@ -38,7 +38,6 @@ do_compile() { fi cd ${B} } -do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg" do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg" do_install() { diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index b0d487ae1c..d085643036 100644 --- a/meta/recipes-devtools/go/go-target.inc +++ b/meta/recipes-devtools/go/go-target.inc @@ -29,7 +29,6 @@ do_compile() { ./make.bash --target-only --no-banner cd ${B} } -do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg" do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg" do_install() {