From patchwork Tue Sep 2 06:45:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69396 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 0DCA7CA100E for ; Tue, 2 Sep 2025 06:45:56 +0000 (UTC) Received: from PA4PR04CU001.outbound.protection.outlook.com (PA4PR04CU001.outbound.protection.outlook.com [40.107.162.112]) by mx.groups.io with SMTP id smtpd.web10.71238.1756795540688708917 for ; Mon, 01 Sep 2025 23:45:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=bfQf3ZFq; spf=pass (domain: weidmueller.com, ip: 40.107.162.112, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KLGp1or2QXBY5jP72qbhSAINKt9N2D+y3j022esemknh5HiFScf9y8Xew0n9T86E96jOGbpd7HXcQkQaXhmPbHQ0dXRQYkQU4eAhuBgaHdiilVEAFENWPj+NAxdaeEHqibdiepJRgFdhQy5lBpdgN3N1pX64ecXeHAIXiKK0kQB6cS2zsP9N69VNXb6bw8byMQEJSlgsDEJoGaqAgwKA/SAOjMB85FW2QF1z1myYBN06qiYs1yWPhPDOLWcusGFBAN3WeOKKz11r5/OBrG2usZ4IiaqKqa1s+Il2yJ4jZJf+jdRfy0oOgMFMuqWQtFZLzX5Pdxk3xUeRg5BxMV7s0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZkxXRUUiBYQdXsuinZvEWs0ZbTcYMnCaOoZb06cDguQ=; b=Th+HcybygJDlQH8bx6OE9SvvmMLHhyBM5dZPnZlOtPV3uMhRmAB8VgIZqGVHazXynn7R52kAmT6BY9i7+MifMFNR6gSOau2LL/yREbmfxj47pux/rwCPYbXZYdXup7b22f9+/jgGA7f/7RK0/0MV4+uTMzCAzNfaluANoZTRO+ytFXj6ewVlMZCC3sOP8L+XM4wRmch9U5p+XPvQp/5K7NHiwH7wNQiaqSAZgYBkiz938jNmi1vFPGd4IQqVeijlmaqvLRFl8+4AgsG8+9dDpFwfC3Xy4BsYtktRKoxDEiQS7Zo3S0nkHJesZu+VjfIldFGp6kAhHrkDrMWIZUkVhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZkxXRUUiBYQdXsuinZvEWs0ZbTcYMnCaOoZb06cDguQ=; b=bfQf3ZFq7OGIL/aZvEhfbKHkR7ueaHWxbZHutDVot9IUQE2ozp/8AKrUTXfB8jY8E4VBvZPF7lPFKMW+G+t8fYyk0dWca4Z5jGwONiKCsuq09silWqLHIUhbHoyOADrK55kjtuxuUl5QTaIWYM7HdJmZwojPBDHGC+lJb4tj0pGDu1JjVJmDUwwL9EY90ZOb2kS5A0wZDh35RJ32WZzmrEbHN777Re++JExZfCv5fpv5leiuzLy82uJCSLCrHO48QdesGyJXNN1ve6kquVvnDsDePWIkQMTUJUenKRKWyzdHts3noNNX0ogq2lxwB1cdGjRF8l7uhMVnS7nC54bg6g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by DBAPR08MB5591.eurprd08.prod.outlook.com (2603:10a6:10:1ae::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9073.27; Tue, 2 Sep 2025 06:45:47 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%4]) with mapi id 15.20.9073.026; Tue, 2 Sep 2025 06:45:47 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 13/15] fetch2: gitsm: remove useless need_update check Date: Tue, 2 Sep 2025 08:45:12 +0200 Message-ID: <20250902064515.30879-14-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250902064515.30879-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250902064515.30879-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0263.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e8::10) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|DBAPR08MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 89898a95-6c9d-43cd-911a-08dde9ec5606 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|52116014|38350700014; X-Microsoft-Antispam-Message-Info: +iuzziCF7v3KllAIfhq+oe5PyQexHjMug9uWT+bcfTyiaQK/witB4zfsqn5eYJG4XSAbUnEMDvkV2aIQpW+ZpHJ+GWVNTG3ldMx1Q4q+Ob9wWEZSrghiYzWiSlzyGuN5P1Ju7AGEGY10Qr7y1pFBmQvzi3ICy0YxH3IBRxgleEQ3nDxgd9i8YgN4BUanJTzv/EtxO6uCni59QdwNL0hFNxn11AHMgOxZuWWb1/JjR8pGbM6ucXHuJGaiuW2kJYpv6UerD+qMsGdUol8BBiqqGTHXX1932+HEK+NksrTveoAKnOyphbqKTtUvdJgwuWSZFa1DgZavXGQdD5shvfqvCG07ikEeTXzUgNwhj1NkHQvLbnQWPsPrRkRx/sPqISlp3rUALUTBsxmgaNO17Cg/XMduXXvg7eyYfyJn3g4y1ee3EOmHfQwsdDy5vYwVcdbL8+z2G/h6lutayXIyjJMPfsCyCikk/y1BwHXXw1b+Pr3Yj9fpienA19EvC1TRNXha05iglHC9U0hzgtIqXeerdk/K92vFJo1gW+lG6ugGTfF3u0vbOPB4gbIu0P+0PekF9aR1H4gRHFGoQMqHB7zQ/5tseSn0Sjq/BAu03sibqiu+vdCy0VeS95xeJ77WKKIFbcZzrKIOw6bA3sS6Pih9x4ZpHRvecRIeaEH+KwZyn2cgCzfifhT9SluXAn+RoZotNy7w4oaX1TttMIlj2rNckdlt+myN5eKRejwLszEw/xeUXceb7f2N7AJ+dYnyaFKX8vtf/GfzjSZytW5BpkmT/UK+Lw/ysf8p3NDkvKVKu3xJDp9wO9Tif4VZ7GDjE4MnkJFg9JWiOSG50EYS/DHHpOT4zcUj332goYfHCN4+XDin5L7Lm1ql1yJ+tnsn1ZGLkRyN2ZpvHK8V89uRakpZwbfYBMI+xLfFzgCrv5FEOiqCXc44xLYYWRK2eq9WdbMCRJsTBnnUEDcOfxgQ8CRoJ6+FDAlWNmGtRHIz32V4JOuHkU7iDo2KYx0MFxxKRSJirxwkYgCdXVGBvhAKRG7XVDFEq7+IwErBoVjNLhu1tfMdGRNeH93ZIjeaGTPBonZ7/J/3z3vC4u0DwowxPKYF2GQnn7Rg5JebImZvKJyW1QaYdTbEd8/IBAbyUcZnJht/nEWgQRqpyR4eaaGaJCOx+C0lkVeQcvTkSeAeDpAxgK+DIES+Xq1EJAPX31QrgxGZX7s+yYvibnnfJRA6yKZh54GbrTtYs32tPPHAp21Zo9b4OioZFITfRCnnkF1vJluvk/4UhM9Yuj7tAs6h5mESxW5wMn1hG/2zy87FdAqBA77iCkbIUv4UP0eSIWwcS8FbHNngD/Jn7+BpofdF23f2IdSWaHf1DzI5lb6ajbnTqo/9Waotx4SKg0WiZxD7co+GmLj9dvvhrLK2LT9EtbeELNXD0J6GIR/PllDkc27PvuP8c714WjIEuFEwtRn4HYGTq16DUdxyOYcUIrEUrm5zMQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016)(52116014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EHwS7YCC79hlhhfWkfi87NZOBsP/+z/tC0MDBrDxX6a/MLsWggGdNke5Jh3y8ahCRKkcWJ4OnFuxggxGH82rhUFWKg6agxYbFKXhXsDgblpfojAGDw/TnOMWWmp6uThspvff+BdSbKzkR+wV8s4qrq6iwjZlL/Q9XdTj7xyzvztwK3SFWWuNGEoMC1TdjdwicbrwkN69GTqjImx9HNU7Yg/hezxu4HDjSRZtR4X9wAo6t3jHSgEb/Kz/OUiiIuLCo6no+GyH8VGBHjPYVNR4ydGfBd8OYla6IGjdEBr7WAD4dO9RhmfOd86N6KD3iuP5k9ixxgU0t6ZGJHciImUgWbQUv2Ir7tdmJKV0YVSgtj1uDVxbhlHyYFQZWEiFY+YhTfm1mBBpimIiLOP28wnCrrg3fUP7Ksc2rb4yTqTPLOAfSxq9plSIDOkp44hhq45TE8HUIuztXgrSwIj2BrihZ/3gWLnHD2kmcFt743X22bh1LsnTaQgn4jkEagmAeN6cEg3faq5icxQy4e89zeOafHzESKFclsXmY0BOsLat7rUdtHM0WcSF/aBdRg9iFyMIrD/l+frh9+Ahwpz+ypsvQb7z80nBrWfVGUrXAgjcpiq1OgcuEkKKluUR3aKh6Rut23aJCQacEabfKVTQpMD8JaebMbQkZ8bo5+qRAUPP+mdQLg/lZtJSqeE4NOt8XNLNSwgbSen+qpNAqujgkV3y08HN5+d4/VDcalhmNuFYz3nKZYZqDTqxMfwTzfuNb38qO0hc5d8Erg29YkMdBFsGGXjVgaHow9E6ZUL+JcorDJbjIEQnlIV/PuOl0khyPbrOjl7LI0fl6j2hAbm7okHK11VwW5SqXTvuoJZC2CQSpBGn4+Tg+JBACp9tVqXzSR/MBYB3/UZufGpuxRTZcZQgsDgQb7m+/AcXLNrdSW1UgCpMUGL47dfyT9+GVkwnzBshcluS8D4LmStoxCDMBxCzO+Ht1EA9T5dUPn1hvpIqgESvhLeKiPof8O4zCWKt4bg8w5/3Dk1Q2VqXLfga8cHrAHmcouBQx/It/1VNtMD/8ZmtGJertolf1QpOHky8MKl2sOuwXG3MEVgYImO1SqDUM51ZwXgU2ykKY1u/5XJ1xDk33TyVHaO6Nv3d5pRbBc6MqNLdnwufpy8yUZNtLN0vBDGtAJ+9E3nvItCR+Nw035RHcqCY6VI8MjLSauueFroheqV0nII99pMdKedY/CpmlPI6XesbwWZ9JxhWVresLouWifbekpyReDtO3Jkdkif2iLFjzMNps4P4T05W6+eBQ0cMinv8UWHQA/TlmpxmJBTZYgWE5pv1VkRtTR2q3DeJWtD9pk1fIa+ztJ5pDjskU+SUJutm0rcuXcFoGdC0NeyVEGAyExpogz0TXD/mNCJINZXjvxpHhT6isQ+PqL6+Uiv56F/kkVXu7vIVszeH/JM42R7DGnaMoaCMf9m+fW53ZmUFhUZY8a4Jgku6w1c3v0+sN9aM6aBtiNzarQqjJ2KNjentz7L2LbnXeDFHKh0g7jhfWGR6rkC0SjNnYGe2pO0wjH+vDTrWU+c7U7ZyqNAdxt9/IFFrwiw9iSzvuYzec70cIpgG7SkXN37uZAFnTg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89898a95-6c9d-43cd-911a-08dde9ec5606 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2025 06:45:42.3874 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nRKb/HSuhd0k9NEnEsH9BfHsrqd7KuYf6utaZj2zzjQFFF1LzsFHkRv38yLEARSWfUnLrpHUdtFugdfMOb6x9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR08MB5591 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 ; Tue, 02 Sep 2025 06:45:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17933 From: Stefan Herbrechtsmeier The need_update check is useless to decide if the clone directory or temporary directory should be used to parse the submodules. If the git repository needs an update, it does not help to unpack the git archive and use it instead of the clone directory. Furthermore, it is useless to call the function of the class itself because it bypasses the check itself. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 9afdc8370..31460b19e 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -143,13 +143,14 @@ class GitSM(Git): return submodules != [] - def call_process_submodules(self, ud, d, extra_check, subfunc): + def call_process_submodules(self, ud, d, subfunc): # If we're using a shallow mirror tarball it needs to be # unpacked temporarily so that we can examine the .gitmodules file # Unpack even when ud.clonedir is not available, # which may occur during a fast shallow clone - unpack = extra_check or not os.path.exists(ud.clonedir) - if ud.shallow and os.path.exists(ud.fullshallow) and unpack: + if os.path.exists(ud.clonedir): + self.process_submodules(ud, ud.clonedir, subfunc, d) + elif ud.shallow and os.path.exists(ud.fullshallow): tmpdir = tempfile.mkdtemp(dir=d.getVar("DL_DIR")) try: runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=tmpdir) @@ -157,7 +158,7 @@ class GitSM(Git): finally: shutil.rmtree(tmpdir) else: - self.process_submodules(ud, ud.clonedir, subfunc, d) + raise bb.fetch2.FetchError("Submodule source not available.") def need_update(self, ud, d): if Git.need_update(self, ud, d): @@ -174,7 +175,7 @@ class GitSM(Git): logger.error('gitsm: submodule update check failed: %s %s' % (type(e).__name__, str(e))) need_update_result = True - self.call_process_submodules(ud, d, True, need_update_submodule) + self.call_process_submodules(ud, d, need_update_submodule) if need_update_list: logger.debug('gitsm: Submodules requiring update: %s' % (' '.join(need_update_list))) @@ -195,7 +196,7 @@ class GitSM(Git): raise Git.download(self, ud, d) - self.call_process_submodules(ud, d, self.need_update(ud, d), download_submodule) + self.call_process_submodules(ud, d, download_submodule) def unpack(self, ud, destdir, d): fulldestdir = self.destdir(ud, destdir, d) @@ -247,7 +248,7 @@ class GitSM(Git): except Exception as e: logger.warning('gitsm: submodule clean failed: %s %s' % (type(e).__name__, str(e))) - self.call_process_submodules(ud, d, True, clean_submodule) + self.call_process_submodules(ud, d, clean_submodule) # Clean top git dir Git.clean(self, ud, d) @@ -260,6 +261,6 @@ class GitSM(Git): newfetch = Fetch([url], d, cache=False) urldata.extend(newfetch.expanded_urldata()) - self.call_process_submodules(ud, d, ud.method.need_update(ud, d), add_submodule) + self.call_process_submodules(ud, d, add_submodule) return urldata