From patchwork Sat Nov 5 15:42:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 14952 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 D9596C4332F for ; Sat, 5 Nov 2022 15:42:14 +0000 (UTC) Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mx.groups.io with SMTP id smtpd.web10.7296.1667662931917442607 for ; Sat, 05 Nov 2022 08:42:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@axis.com header.s=axis-central1 header.b=hsRbNS3N; 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=1667662932; x=1699198932; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=10MyaCFEsNlgaltBMbMRd8q3eemhmCUNvcALiC8q7/Y=; b=hsRbNS3NrNExrHHXuLvwjNXyTO55yzuEVLaVw3iSPMV4bRoJFrydgbYC 2hjK/ZzBDJV80/vmKUDvW6HGwseUoN7D6YCxkHMUDY/Gzkh2cL23tsAnH l0d60njUGdoJP31K9F8lqE7wQLtjJub9WXMNCX6iI2ukxdSZqCWiNdYSr E6nQNWPnWdbj2FLuotE8y5u/kPQ6A/VyIpn9Vq7+TtQHRvpzwRghR5tUF w62qaqgqLqzzUJD9F7W76JpcYmx7o2R+ET09nSkHl8OGGuZwSS0B2e64T dcefKazHBnZV+K/LySVthnCZI867CnIV4haqmkUW2eQ7A85FYr1kRtkW6 Q==; From: Peter Kjellerstedt To: Subject: [langdale][PATCH 1/2] externalsrc.bbclass: fix git repo detection Date: Sat, 5 Nov 2022 16:42:02 +0100 Message-ID: <20221105154203.273684-1-pkj@axis.com> X-Mailer: git-send-email 2.38.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 ; Sat, 05 Nov 2022 15:42:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172747 From: Martin Jansa * fix issue introduced in: https://git.openembedded.org/openembedded-core/commit/?id=95fbac8dcad6c93f4c9737e9fe13e92ab6befa09 * it added check for s_dir + git-dir (typically '.git') isn't the same as ${TOPDIR} + git-dir, but due to copy-paste issue it was just comparing it with s_dir + git-dir again, resulting in most external repos (where git-dir is '.git') to be processed as regular directory (not taking advantage of git write-tree). * normally this wouldn't be an issue, but for big repo with a lot of files this added a lot of checksums in: d.setVarFlag('do_compile', 'file-checksums', '${@srctree_hash_files(d)}') and I mean *a lot, e.g. in chromium build it was 380227 paths which still wouldn't that bad, but the checksum processing in siggen.py isn't trivial and just looping through all these checksums takes very long time (over 1000sec on fast NVME drive with warm cache) and then https://git.openembedded.org/bitbake/commit/?id=b4975d2ecf615ac4c240808fbc5a3f879a93846b made the processing a bit more complicated and the loop in get_taskhash() function took 6448sec and to make things worse there was no output from bitbake during that time, so even with -DDD it looks like this: DEBUG: virtual/libgles2 resolved to: mesa (langdale/oe-core/meta/recipes-graphics/mesa/mesa_22.2.0.bb) Bitbake still alive (no events for 600s). Active tasks: Bitbake still alive (no events for 1200s). Active tasks: Bitbake still alive (no events for 1800s). Active tasks: Bitbake still alive (no events for 2400s). Active tasks: Bitbake still alive (no events for 3000s). Active tasks: Bitbake still alive (no events for 3600s). Active tasks: Bitbake still alive (no events for 4200s). Active tasks: Bitbake still alive (no events for 4800s). Active tasks: Bitbake still alive (no events for 5400s). Active tasks: Bitbake still alive (no events for 6000s). Active tasks: DEBUG: Starting bitbake-worker without -DDD it will get stuck for almost 2 hours in: "Initialising tasks..." before it finally writes sstate summary like: "Sstate summary: Wanted 3102 Local 0 Mirrors 0 Missed 3102 Current 1483 (0% match, 32% complete)" * fix the copy&paste typo to use git work-tree in most cases, but be aware that this issue still exists for huge local source trees not in git [YOCTO #14942] Signed-off-by: Martin Jansa Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Peter Kjellerstedt --- meta/classes/externalsrc.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index 06a9548a20..5905342589 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -212,8 +212,8 @@ def srctree_hash_files(d, srcdir=None): try: git_dir = os.path.join(s_dir, subprocess.check_output(['git', '-C', s_dir, 'rev-parse', '--git-dir'], stderr=subprocess.DEVNULL).decode("utf-8").rstrip()) - top_git_dir = os.path.join(s_dir, subprocess.check_output(['git', '-C', d.getVar("TOPDIR"), 'rev-parse', '--git-dir'], - stderr=subprocess.DEVNULL).decode("utf-8").rstrip()) + top_git_dir = os.path.join(d.getVar("TOPDIR"), + subprocess.check_output(['git', '-C', d.getVar("TOPDIR"), 'rev-parse', '--git-dir'], stderr=subprocess.DEVNULL).decode("utf-8").rstrip()) if git_dir == top_git_dir: git_dir = None except subprocess.CalledProcessError: From patchwork Sat Nov 5 15:42:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 14951 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 DA139C43217 for ; Sat, 5 Nov 2022 15:42:14 +0000 (UTC) Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mx.groups.io with SMTP id smtpd.web10.7296.1667662931917442607 for ; Sat, 05 Nov 2022 08:42:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@axis.com header.s=axis-central1 header.b=MxfSE/Kr; 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=1667662933; x=1699198933; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=w6GGAarfB79IsIhh4JWO5sD05wzEq7ZBkYlWaHR/QQE=; b=MxfSE/Kr5skP4k2Vl2eYtrxMtONZZ/rXxPGDUfs6rV9K1e/4kFq6yY/F C1eEZoN9X0q6SGkbKTGvP2+t3sydxaIvBRuYYwsLgRTqo9G0t6UsHdhkv ALwWfKyhT/r/21Myd3evyNeXTbUM81QPWhD2sMBYnELsYnBl/nycugWx8 yJ4RmNX23/lpbIJfgidEKmzqtEBU2b722qx2CG0ZQWNpsBXNJBkZgnNBc OZpqEfEttV53XENtUi2sQkD0g+D7aM+cnLW6W4qm78rSxa/E5l+ikcV/I OWoIDMO0qT8rjCHBzF54rwOP3xNUn7Zk8bFL2kWCJN89H291r/hXUwcP9 A==; From: Peter Kjellerstedt To: Subject: [langdale][PATCH 2/2] externalsrc.bbclass: Remove a trailing slash from ${B} Date: Sat, 5 Nov 2022 16:42:03 +0100 Message-ID: <20221105154203.273684-2-pkj@axis.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221105154203.273684-1-pkj@axis.com> References: <20221105154203.273684-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 ; Sat, 05 Nov 2022 15:42:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172748 From: Peter Kjellerstedt The trailing slash in ${B} caused -fdebug-prefix-map=${B}=... to not match as intended, resulting in ${TMPDIR} ending up in files in ${PN}-dbg when externalsrc was in use, which in turn triggered buildpath QA warnings. Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Peter Kjellerstedt --- meta/classes/externalsrc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index 5905342589..75fb91bcb0 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -61,7 +61,7 @@ python () { if externalsrcbuild: d.setVar('B', externalsrcbuild) else: - d.setVar('B', '${WORKDIR}/${BPN}-${PV}/') + d.setVar('B', '${WORKDIR}/${BPN}-${PV}') local_srcuri = [] fetch = bb.fetch2.Fetch((d.getVar('SRC_URI') or '').split(), d)