From patchwork Fri Jul 22 12:31:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 10525 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 314B3CCA489 for ; Fri, 22 Jul 2022 12:31:46 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web08.7063.1658493097007600753 for ; Fri, 22 Jul 2022 05:31:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=JqggI/Qg; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: quaresma.jose@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id id17so2708326wmb.1 for ; Fri, 22 Jul 2022 05:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P89kXkwggxp7z9syyc2X/9Zn+F4E+sASuKCQ3cmY83w=; b=JqggI/Qg7forh9EkuXNjsWiHQSa6RKHb3GS+EuIijjKPsGC7jOapudWMt/OmrMAei4 EsMNeKuNs8UjHmMfWrCl2f0nbjAOjxJLCP6Tz5yVx1THQgofAyqiiDXymwS1h+o15xZD taDZP769kdQi9yePTtkh4uDo8wglI5yXl1LDdwQmHP0w99VKr3uZWHuxI/XPPJJelxlb XQsRP7iqtwvcKSq5lLnkChN6u0Zzx015ptRIBXGheCWrW+lZrBGa1jfyM6b9kmBIKjNC WRNORpC8R4QUL5SEBhLrHzx911vuNHqcIP+APOb4jO98XoWbcYDp5Wz3tdMSLrmmHB2u d9OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P89kXkwggxp7z9syyc2X/9Zn+F4E+sASuKCQ3cmY83w=; b=2/P20GJDlhTHtOz9RDENV6BU1m1u46DmqNREFUnN/vX15dYTBNTEPELcCm34IlScEs pSoaHUMj1bxR1mZD8T3YFBpvuab4vDzb9HhmLOGmOH4a/m6h64VfMcuNGf2qBKnhnRqs VvHgrtJsJoIoBkiKyXOfk3qyjvrpnQLqP049iQnnmdnB3WhSvK0adNB2ihEgeL414uK9 dbqm9Ie5w0rQgYShVC8wgRAbulUX3h8qqj6d+ZhuNMQ79VRQydOwVWuwm7KnmxCemIl5 Toe+8VIXNcSJu6JTbnQS45r5DEn/IgLU8hYkgRkzsbQ481j5A5Rh0eGE0MVI5guauDzl 3zcA== X-Gm-Message-State: AJIora89YJ7JUSgonT9jtOuMYVQoDTwlndekXChEwLc9LtbSaK14nCaG 9gBg/iBYD9MEZDOdqnOmuOS1ijM3PLQPvg== X-Google-Smtp-Source: AGRyM1vNzO4j5B9YMsGfQ1AZl5LUMDcPgUOdxlNvbZYwhxQ6dcbNmpT0GpIULWqbpL6zHEkVOKeuIA== X-Received: by 2002:a1c:4c0d:0:b0:3a2:fc6e:f8c7 with SMTP id z13-20020a1c4c0d000000b003a2fc6ef8c7mr337322wmf.102.1658493094938; Fri, 22 Jul 2022 05:31:34 -0700 (PDT) Received: from fio.lan (176.57.115.89.rev.vodafone.pt. [89.115.57.176]) by smtp.gmail.com with ESMTPSA id q6-20020a1cf306000000b0039c5ab7167dsm8404001wmq.48.2022.07.22.05.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 05:31:34 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-core@lists.openembedded.org Cc: ricardo@foundries.io, daiane.angolini@foundries.io, Jose Quaresma Subject: [OE-core][PATCH 1/3] archiver.bbclass: remove unsed do_deploy_archives[dirs] Date: Fri, 22 Jul 2022 13:31:22 +0100 Message-Id: <20220722123124.390710-1-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.37.1 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 ; Fri, 22 Jul 2022 12:31:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168404 Remove as commit b3afe7d redifines it. https://git.openembedded.org/openembedded-core/commit/?id=b3afe7d9bd25a943e947de3ec064ea245173c5a8 Signed-off-by: Jose Quaresma --- meta/classes/archiver.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 33070cd17f..5da369d422 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -69,7 +69,6 @@ SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_SRC}/mirror" do_dumpdata[dirs] = "${ARCHIVER_OUTDIR}" do_ar_recipe[dirs] = "${ARCHIVER_OUTDIR}" do_ar_original[dirs] = "${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR}" -do_deploy_archives[dirs] = "${WORKDIR}" # This is a convenience for the shell script to use it From patchwork Fri Jul 22 12:31:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 10523 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 2C47EC43334 for ; Fri, 22 Jul 2022 12:31:46 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.7168.1658493098025166569 for ; Fri, 22 Jul 2022 05:31:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=O6miEm27; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: quaresma.jose@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id id17so2708348wmb.1 for ; Fri, 22 Jul 2022 05:31:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=044YdHDdDByhBSLJbRPXWl0Rjfdxao+Pg/kG1hzQHaA=; b=O6miEm27oREhV1WkD/sxi6jfPo9F0ihI+vEEqVy599n9U/nchcPKK9hTFdDsbD5Hf9 ezPSekqHRSnxHpuztyPgChv1MWgNSjqRd8Vrcp5xTVy2ZbVK5NVvjzNRY0mkAFSezyYA GLR2+GjWcoMZn1xHiEnoKl5Kq0V/8hhC4XBH2TwTFK/aSJ8YsneednX1Qa1q4vQ9eCkS /ef9J4LLpNJOzMkt1xHj6NZq4UcbbkzOF2gLc6r/qctwU0WRycrzlRLHO35QRwjKJNan Xp/7M8xdwWYGQ5ZGWWyim4lLzqhHug/Ws9JLl8QwCXKHu3IibYDuo4kp8OK9iVbIJpQJ tpRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=044YdHDdDByhBSLJbRPXWl0Rjfdxao+Pg/kG1hzQHaA=; b=ub4TV5+8boUnS/dvrBDNCNGJFQPOTjVGI7x24zDoouaO1rYGbJe9WVHNd5KliFDZt+ kKGEzSo7xBElOS9Pyg3CTK+KxCENQ8Uov2rXyR9dXDRiNJffbi63l9ylbcMOpHM46FXW llTJA9tcvfBA3vIq+v1jV2SqaV4/9SeuUvcEks04bk1nFWBxzW7YepgW9PnkS7SpO969 vqzA4+K7NWCor7o/P/NFeEp1bRdij/y99ae/eB167aUgCC2E0jabWOpDAnLZ/ZF5edL8 H3vjvVcupXZK2SEfH012dNKuJ6SRZYuPrbtKVKD2rAkW4Bz691k1mkX3X2fQHMAx+7Cd LXJQ== X-Gm-Message-State: AJIora+teVHR3QjMSeBYmDtxIBoY6V5xiPD4xwaS1OGpyl2hMiKRXg3G cjrWm9qUYn+fvjnmvz8j9PX8ZOPNQ49q7w== X-Google-Smtp-Source: AGRyM1um603ddppEm1PIUEmPcmnU1FK/hoie5CHaqkKrz2kTDcgVmSMQFFpLLLRu93d/QNpgthZJ4Q== X-Received: by 2002:a05:600c:211:b0:3a3:194d:7282 with SMTP id 17-20020a05600c021100b003a3194d7282mr326249wmi.132.1658493096148; Fri, 22 Jul 2022 05:31:36 -0700 (PDT) Received: from fio.lan (176.57.115.89.rev.vodafone.pt. [89.115.57.176]) by smtp.gmail.com with ESMTPSA id q6-20020a1cf306000000b0039c5ab7167dsm8404001wmq.48.2022.07.22.05.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 05:31:35 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-core@lists.openembedded.org Cc: ricardo@foundries.io, daiane.angolini@foundries.io, Jose Quaresma Subject: [OE-core][PATCH 2/3] archiver.bbclass: avoid kernel rebuilds caused by the do_unpack_and_patch Date: Fri, 22 Jul 2022 13:31:23 +0100 Message-Id: <20220722123124.390710-2-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220722123124.390710-1-jose.quaresma@foundries.io> References: <20220722123124.390710-1-jose.quaresma@foundries.io> 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 ; Fri, 22 Jul 2022 12:31:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168405 The commit b8c5680 [1] add the funcion is_work_shared and at the same time change from kernel-yocto.bbclass to a more generic kernel.bbclass. This is also a fixup for the commit fed0ed8 [2] to avoid kernel rebuilds because of the do_kernel_configme->do_unpack_and_patch task dependency. [1] https://git.openembedded.org/openembedded-core/commit/?id=b8c5680a67888d43540366a40bd0c501e926ac31 [2] https://git.openembedded.org/openembedded-core/commit/?id=fed0ed82928e6a7846fbad233ac657bd17bcefc7 Signed-off-by: Jose Quaresma --- meta/classes/archiver.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 5da369d422..9c605cc932 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -610,6 +610,6 @@ python () { # sstatesig.py:sstate_rundepfilter has special support that excludes this dependency # so that do_kernel_configme does not need to run again when do_unpack_and_patch # gets added or removed (by adding or removing archiver.bbclass). - if bb.data.inherits_class('kernel-yocto', d): + if bb.data.inherits_class('kernel', d): bb.build.addtask('do_kernel_configme', 'do_configure', 'do_unpack_and_patch', d) } From patchwork Fri Jul 22 12:31:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 10524 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 2DF33C433EF for ; Fri, 22 Jul 2022 12:31:46 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web09.7137.1658493099234779158 for ; Fri, 22 Jul 2022 05:31:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=JPJFAls+; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: quaresma.jose@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id f24-20020a1cc918000000b003a30178c022so5089481wmb.3 for ; Fri, 22 Jul 2022 05:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sgCqS2WTowrWHNZjk62KxMD5w3QlNbc2gefNiYllefc=; b=JPJFAls+L1pvM/Z+ponDwecnEeMad8Cfw0k4fcrTQcFfAF7Vg5HnZy9WM9ex78g+pu X8ik1MOKYJ58O+/b4phR2irqD2vRv+kCOIW6LrABrU0xkdEvQmQzDISq7CteGQw2tTSV xcZzJnF8AD9boY0ZxL4ypMVOlOvvvNetVMsUfdvwZT/N6TZSdSFnGpyhLcAwdHdR6sqg z8Qac/tcLqUo854OM+7WHFzKSBkAlWAv8luvBgHvUG/RPym+BfESLXvW+I6d/9P6mEGO IqjXOjwV0cuUmyxjztAfBQhPLvJu9krX3MaKnY1yPyHLUlG7NrYQDuQUFcxT8yThKVUQ W72A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sgCqS2WTowrWHNZjk62KxMD5w3QlNbc2gefNiYllefc=; b=mFWwNm/zbSGdbmM5Uvl8UmbF7uJe2V6jpCMMhERQz4wmRWWESp16GHpf4hZdc/oskV +KJAOtgGe5EUejPJIb7bvBwkpmfYqC0xjasvten5uL8MCSZWGfRULIewQ+VhLNdjFv4D KgkE8DX6Z5nr9N/Um9SAPnKm/6p7LslqcBUJWNz4N1YJE7E68G7REchBUotS5Cp1dT59 2c4zHxTg9ZD+YaO8BxHjzsw9qBKp4ugb6dlgL3XsJMhNzuxYBuofrEsGWrwH9YIOFszo Sv/c6uf9fE5j0nGBnSBjifK6qa8kDX5iatGZ0nunHyWKUnbQcwGBJCQ+b3jXEN718dcW A/NA== X-Gm-Message-State: AJIora9YOQfeKkBH34aoAE2uKJRNwLm2/DAOAeIeue/eVEJ1BbU7FCXP a1VRnK9OYJWiFuPvEHs0ivtw1nL3+2258g== X-Google-Smtp-Source: AGRyM1tVgLdy09NREhgO6EE3IJEJwuKVUkwA8+CDuk8MrdUUwLteSg8y9G/gR7rdLoc9cn5kS8Xs5w== X-Received: by 2002:a05:600c:2194:b0:3a3:bea:1017 with SMTP id e20-20020a05600c219400b003a30bea1017mr339765wme.44.1658493097407; Fri, 22 Jul 2022 05:31:37 -0700 (PDT) Received: from fio.lan (176.57.115.89.rev.vodafone.pt. [89.115.57.176]) by smtp.gmail.com with ESMTPSA id q6-20020a1cf306000000b0039c5ab7167dsm8404001wmq.48.2022.07.22.05.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 05:31:36 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-core@lists.openembedded.org Cc: ricardo@foundries.io, daiane.angolini@foundries.io, Jose Quaresma Subject: [OE-core][PATCH 3/3] archiver.bbclass: some recipes that uses the kernelsrc bbclass uses the shared source Date: Fri, 22 Jul 2022 13:31:24 +0100 Message-Id: <20220722123124.390710-3-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220722123124.390710-1-jose.quaresma@foundries.io> References: <20220722123124.390710-1-jose.quaresma@foundries.io> 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 ; Fri, 22 Jul 2022 12:31:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168406 This fix a race that happens when building some of the followning recipes with kernel at same time. The kernelsrc uses the kernel shared source dir as their source S = "${STAGING_KERNEL_DIR}" and this will cause a race in the do_unpack_and_patch task, when bitbake runs the bb.build.exec_func('do_unpack', d) because do_unpack will clean the source dir on startup. | ok: note that S != "${STAGING_KERNEL_DIR} for this ones openembedded-core/meta/recipes-kernel/perf/perf.bb:inherit kernelsrc meta-openembedded/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb:inherit kernelsrc autotools-brokensep | broken meta-openembedded/meta-oe/recipes-kernel/cpupower/cpupower.bb:inherit kernelsrc kernel-arch bash-completion meta-openembedded/meta-oe/recipes-kernel/spidev-test/spidev-test.bb:inherit bash-completion kernelsrc kernel-arch meta-openembedded/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb:inherit kernelsrc meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb:inherit bash-completion kernelsrc kernel-arch The issue can be replicated with: INHERIT += "archiver" ARCHIVER_MODE[src] = "original" ARCHIVER_MODE[diff] = "1" And: R= bitbake -c cleansstate virtual/kernel $R && bitbake $R Signed-off-by: Jose Quaresma --- meta/classes/archiver.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 9c605cc932..c9ff4b2c64 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -459,7 +459,9 @@ def create_diff_gz(d, src_orig, src, ar_outdir): def is_work_shared(d): pn = d.getVar('PN') - return bb.data.inherits_class('kernel', d) or pn.startswith('gcc-source') + return pn.startswith('gcc-source') or \ + bb.data.inherits_class('kernel', d) or \ + (bb.data.inherits_class('kernelsrc', d) and d.getVar('S') == d.getVar('STAGING_KERNEL_DIR')) # Run do_unpack and do_patch python do_unpack_and_patch() {