From patchwork Tue Sep 2 06:45:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69389 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 E6DABCA100B for ; Tue, 2 Sep 2025 06:45:45 +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:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=GEElsScc; 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=lrIdsS90EznWbn5ADFaGzDLeNio5sQSBDZcHQusoY0iA72UpLu3OB7S0Z/VELCLQ/RUoD44/r4FcDHRlGDTrS3Aug8N+529PuQQRUdSTjAm8Cj2dTTLDFA2GxrU1uNEv2Hwm6Ae0YXVCkFAz037CK1N9h59zXuj25CK4RkUHhgr9u3y65JlZFb6i2wJJt5JVi5ugdoycR4hgUTMmbzA3xb5EtbvDBXMPAQsSWY+unFqn1vJDNmXaUMbXWlKgsXgRwcaJNpqaOHN3KH2e0tX4cCr2rkRQBPIW1gi5p2yb2jzMY0UGScGx9jBZV8fgS4OmRnmEoRKGxzZ8Hu9LCcTraQ== 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=cpYlOHQQtioKu3Fs3/rIu1WRihUuP3KTMxEYY4oWG7Y=; b=haNemamC0l04ybEXTR9uQAfJdys4QwSfxje80n4yLzwm+y2grhM2yeK/+Aax3km2wiMbc1I7NRi+FZ0CeY/Ao4WCzLLINQO1o8sA7jEd7kpD2RJ5bkQuph3QCFp51z5/BuQljV7kJ79BUZHyvVOXDiFVpbwKv1uAVPmnWLOcbeRm/zR7g6YROYbrj/45plbePibC575yMQtfZqqeuCcDuKmTs1yu0WBAMyeLwwL1JLIvSnss5TqrjDC2liO1eMRDTE+x70DrVrAQUIIOGzUZbEI1U0b1iYvgewFhFaZv2fp6I2utL/FOu46PTfmYerNlBZNm1RJ9z5q789oJ1piz8A== 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=cpYlOHQQtioKu3Fs3/rIu1WRihUuP3KTMxEYY4oWG7Y=; b=GEElsSccY5LvZGYvSlA5aeAuZWVE37dIkavfr6S0CClBi2oAayyUo3h835/C8imjmQdKcjmiUYHTNvjLSLnapT62ETWWrE6zFdlQSeejI/WLfRsYzPr7qGFM9GGcBQd7w0RFiWsv5iMgepafUnTGboEyGpufWnayPVgzL9Lddf6bUVHLvlssssWceNUge64Qlh5Mn7WHYVIc0+0GvpYQoFjep+N3d6euZD5PUSMqI4Dg5KPPryOpftgHmfk/5kse1xP/uHUYz9A49Lxekbp1zB9hipNc1D7Vpv5e3L3IUuJAJn6fONpkiHbBqHCBsuhzJfYX3D3IA4cw3Q2b/cFk8A== 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:36 +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:36 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 01/15] tests: fetch: add test case for local paths Date: Tue, 2 Sep 2025 08:45:00 +0200 Message-ID: <20250902064515.30879-2-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: 1f4b7c63-6f6d-410b-83f2-08dde9ec51f4 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: EHA3AUKA/EtKJrZ8tz/eyjyHZpmcplhX1iiGCSsoCA65BjAZcQ2GeIPIXIyJjwBXxTi8wz+3zqT7e82wQz74JvKGsd07vd8X26eYdcENATeGzY6sOeSDY4aLzIbdiL5m1TwQJg+rT7CfK7qyzO4Ey+GtYOorb40Nu9E0lyob/OxFiWx3hBDee/JQscjP848MlDt9Kc8jiAhf3/JuTp0DysJk0V0UIW/PHBqmUeCC+87SAt7GWSs8DwGgNybUiW//9kKTEvrUWyIWa/2pHkLWpmdT0CiP9r7KwNwctFPq4kXeWGOul9OQOl1wIm2AXnwdplCK6MujgVlzMJUEKUdAeZhoE3iiBAdFecsEsIe8upH9wHNAh+xcA6xapY4TgGpsgcoJr/e+08NSqAv6Z96TdwI29AD3/E4D8PxAwPdX98mCNnkGbmRnu6n9p8VnRzNSeeFwSED/70m/+UC0DcwZXXFrZKUaSoebM00ErnmRlOYqkT7X8IiBsHQQ3YOgYqTENw8xZHL2QrqBfdFObbDdQKscZ4Qvc177U4rLeqQ3+GPD0nu29SMs8rtiLclTnqakNLLMoZ0/J0MCVA5H37xHtykh7rwrC0ykFaGg35uagDZb41TYyeOZYTb7gSej586oQGk2eWbw7SLS3yhdY2uMyws0uizdqhHccvePlub02BVgOtvyrmYVNJOI6/uNMwm/+KoAUAqzcfGnRHEtmqdgBpKoZTtkz4S/OkpfpwUUrxjiGRyBgEQisDWhHhTYsIoaj1lfG7QNCZHHc/Q0xAkq7FjLJ5k29lrKOU/5rga0G4IkHj/qtc8yog/dcqlD63LvGYue332BkY2VmexvViSf2KCKjRYrgOvUDNZlMMCtr04ZWhei0gJRkJLpVLeAikgbnhTY+ify39rBy2C+UWZbambj9rgbY8wL1Sqi1G87aYnRjuFro4vLrkyH3+e87TPmGtyxAlSufTFOVJpVbjEgF20rmmZiT2aRYTSytQuGalJMuSJM+b0YNnRY8hgLAmmwoEYKx6JIbpiWbAMQVr5H/vv3jwSR/fn2DT0OKOL+rwWUdRZpszsBWsVSrSoA/WtyDUIT629YyIMHFleF30Bcq9H+pgUQVdm/ZtgPkgbfJXOIEMLlDPV8IE0BsNjM6MC1GuE19XbXqzbCRRRCgDkpR6q4GGfJWNVx9O1M1PqrHPpwxJIcVIAbUL8dju1ZbKmuepeM7mbs6M1wAvAuzVHUO/FRfTwF9yC2sa6Vjuq+pMRzGAR+Dl97UhY7FUif9gNgdD3qmyIKLqevvDSM5NSkulu/uXUiXKf7oJpqeLY4ya7drARHQNyW9nY+dbU8V9LTBMLzRPAGxNMBjLR9AHsaDTRYJsyJXSTSQR1J+f90pE5MG3/4OVfJ970H0NUL6oXMyIVsU0FrCfRdjpSyH5IZC8gyZqvjoCqOjZ7GioRKdkU= 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: SIXue7lcW3dn4P1UBireENKNPVE+0gRaNuxiVvq2CL0jgjukc2DqVjB30QUV0qqXZlA8UnDD8cMn8Lld2V+L5tTZclmlX2YIK5o8/kZYCOO77hW8Ygdy/f6RL0+4YaC4UhTtrutPt1BDx2TLNYiCnWQPBM+f3mGZvpDREfg8k6kmCxNB8Mdbkv65shNZ+bF7GG2N/i1eGgRg6PGx59gHXrLX3tOkONIiBlzVxmwGU+kQIzuX7Do05cBHlXvgsAGlNtcst4+yHCcujxwHTE6gw2J1TGeV/a+b2nmuj2YZoUko2SozeMOBUreRdrbao5Jdc6SlxkpxTBQQrrljAYGHtY067yZkhSocMLwT5ZfVaH5EmFWamJNa/5GB2tBDAgoqK1U4uGp6xwkniP1ZIp+kXOH8QmZuulCy464yksSKQVw4OOf8WBp+v+1S+iehJK3/L5ii+gj+Dkr2InHpT9RLV3VqxR3+mc6MdaBQEgLnIiGbyZNPH05q8WJejVaIOnJfe2BtcQgOv/TdEyy0gAzvrCJIPpakZ4CaWTk6m4a87EhCdA8ezq7gRCBA+cl/YNDdA9XD4kviCcz2q1siIetVQ9lWGcFXv84B1pwqzAOo2PlVFwhL5FdSbTMnzn71YbvZvqjnzkzi6Dyd0jthsdndVcoQrSS4c7B8XGSqfE1Hbi4vHoWEdcCDWxpiAPz8xgPMjoAGr1/ofDuVOef8SYUYAHYcUXhy7zsCFfhjgcb6bp2H0chuMk2j5sok2nXQJROzq1QAGc9uCOoBHXcfNKPdp7Ccgm1cjcyYe4kWVg6w0A21yrgrc84QMWmQcQ5Jcbeh/kxqfNqelkefopBXVme29Rj2Bswt+lOK4HekzXMxx727l2U4L5TtYnUksq0q3fWDJc1etRjifTf+e63yzblLs5Fn44z3o9rsS1O4UTLIEP/8fY6/z5j4MmHgVhZ+V7SYqpjLmLl0lODNd+/bcKQTgcCY93eOrY/Os2i7sxSPjvTGtr139HMysJlQr0LxT//I0nqH8/RSqyqMBtCsuJSv/3RzJbShCa/DtsmbrAIqJUeJrGRVY625jGfGSHagL9JwJKvPk6Kv1FddvsTgwA9DB8/ghw4w2KCQMj4mPbLKD90j74xbuG1qyJQYcHyJC+xFCjvKPBpurBJ54oslAUP0R5nClISbO9eRuUTpX1gO8osV+Xeuw3HFD0MOnPdN23TQS2Td49nMezEmynsYzpThL7ww1hlZoMwyM75rM7uyT4a6ZcVADqqUtCLzQq45MYr8RoKc2JbMZSZ0od34h3LJxtkddkG7vC1LniR2IM9tauNGo4Vi8SpYC3v45T77LmKx6L5Da26nXbY7uJ8GvVz3SuCXZp7pMQmffy0qm+Yzr4hAW7T9bKnTDTVAFsvA4fMOsOnNzSQcFcIEuBfk4i5jYpC/SzeMSzBmIvxB/mowE2O5pT0iZQUAyQJf7HSpdjqsXygZcuy2LLPGY39lunzVoePMQml5eiZzERfAS7u2FW1tMj3pqQH59OO4NDhV+iY0Ifd9RudONoJNicySMEVOjZhCgea89iZCAHlWl9mpPUf5nzu7ZymHQ+07k7VWov3mVwD63YeNFdU/UgS7pawFJA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f4b7c63-6f6d-410b-83f2-08dde9ec51f4 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:35.4576 (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: OEvjEcj4K8zIE7K2ADcwf7VmcKXN33epV+ucezw4A9r04p5IsLunU7FmiQg7Xm8bg9SoH4QWeysF2oglcE61xw== 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:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17921 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index d216eac2a..6067b02d2 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -3797,3 +3797,24 @@ class GoModGitTest(FetcherTest): self.assertTrue(os.path.exists(os.path.join(downloaddir, 'go.opencensus.io/@v/v0.24.0.mod'))) self.assertEqual(bb.utils.sha256_file(os.path.join(downloaddir, 'go.opencensus.io/@v/v0.24.0.mod')), '0dc9ccc660ad21cebaffd548f2cc6efa27891c68b4fbc1f8a3893b00f1acec96') + +class LocalPathsTest(FetcherTest): + def setUp(self): + super(LocalPathsTest, self).setUp() + self.localsrcdir = os.path.join(self.tempdir, 'localsrc') + os.makedirs(self.localsrcdir) + with open(os.path.join(self.localsrcdir, "sstate-xyz.tgz"), "wb"): + pass + self.d.setVar("FILESPATH", self.localsrcdir) + + def test_localpaths(self): + localpaths = { + "file://sstate-xyz.tgz": + f"{self.localsrcdir}/sstate-xyz.tgz", + "http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz": + f"{self.dldir}/somefile_1.2.3.tar.gz", + "git://git.invalid.infradead.org/mtd-utils.git;nobranch=1;rev=1234567890123456789012345678901234567890": + f"{self.dldir}/git2/git.invalid.infradead.org.mtd-utils.git", + } + fetcher = bb.fetch2.Fetch(localpaths.keys(), self.d) + self.assertEqual(fetcher.localpaths(), list(localpaths.values())) From patchwork Tue Sep 2 06:45:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69387 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 D8492CA0FFE for ; Tue, 2 Sep 2025 06:45:45 +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:41 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=i231pnzr; 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=qvYTXVYs+CMvH8rkwkRDpT25eOtfb+7nbITBhBZpHC989ZvQvPCB7A6A8Kjww/oal2iW2bbO231rugst49Dqu7b4lvGzgQaJiaK4XBTMjDjfCfWQJyVpqmdWT1Mbi+csv79fkYP21RTtIypgegMvdPo2XHDUexpW4LlMzQTMqeB5kiThxnv2B82CEtmz0kTwCInAmMyTgoOAK43AYfCWX2gYeUKg4WwxuDfE+VI9HDWJP0a3JU/IvozobCfdBfa6LxX+Y30YhKgqEp/VJreTIs5ZdHkDGQcYGnQE4QXyJ/3vjwDOmY80MgWi7YpW9pNJVgCTzWWGZxERd0ITKRkD3Q== 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=tuKFFXgWczR/sOnmcWfRRkgSh2R9rnq8ah8oKzB8YV4=; b=BJ9Lt1TgwPEx8uHL6k6dB7RBQ36ZZtp4tBsxeJYH/FA43Jf+C+C2XpezUS+A6doEUI1jwZWFZHwjHaQPM0J93H2pNQieWUFfkQMRp0mjMlqd8n5pJeFtj9r9YJ+xB12ecdd++utehFAMsxZ0lhlN1UuiodYN2lJ2F/+61Dro1su0yoTs0wqAPiWHdVpUd2oJoFT38nu66ONtuRGPTryM6XNWl0q+6obfo6zYMXJb+UiCCoaIlzMwdnxQWkJu4vaehVBDImQWPzHIkC4IdtpIRRpohxr+QlNp++5FLPN35n8A2jkirmvypmh8saPEf/PsrwMQcj/C50CNEbiTtZY9bg== 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=tuKFFXgWczR/sOnmcWfRRkgSh2R9rnq8ah8oKzB8YV4=; b=i231pnzrUTu8utdgrsnqk48lhjA2DawFwf9oDpw7aqbeB30t3q7YSK/gcrW+/TK0szmiHsqR2wZEPhQU5mHme3OLYBappJPOeshqfe7GObbBzbsvd2hZ06kL6/FEYg2WAhBJkZpDRS3WnhK1e2phoSLCKShLnmJvTsD3NJLQLrCreEjJiGyvybjpFsK0UKMLrb6qCpLkktxAShGofStAUYRRLhURejh5VcRtKXo9rp5HI1usjfw5RZE4697l8duDdRZ4g/XOREtGWj5w7ByYoYwYmdc/T06l7cjXVV2nxhheuya19EhE0kxCsX1/gN81+PtVCc+lj3XPiIi2Fur27g== 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:37 +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:37 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 02/15] fetch2: support URL rev paramter for named URLs together with default Date: Tue, 2 Sep 2025 08:45:01 +0200 Message-ID: <20250902064515.30879-3-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: 29184588-65d7-4398-3816-08dde9ec5239 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: oeewwvLzz4i3VvQY3wF3Nhw3dxOnX42vHNGJj2miCiU3BumuW841fyO69i5+SbHAIeQcyq4exiL1XIG7AdOjK+ATSRqZHpaiXt+mYvbMLmaF6r22t3n4dPo8vQXh7rE2vKcS3YWlEdp5MD4B7sDYFvVzpruBXLDgztYv5CHSHw+KUK7waMMerguzzuvJ055mCB/0hkB/LcFkZwYw7bdfpbtJjNEvbNiz54AUp2JZYGqiXtxM20v6GRaxKEtfcQlH4ai3Qq4cAj22HirK74vRuVqRrMH+EtFg55WLAQhi+WzRY91+YlRM8SD1gyw8tO6ROB3HdjaHu2StwS6CA4G62qYUrgs8K9JfD4HDdiKjRjjC+VMvicG0MFlK4QLhW4MzpgXurzq6fZbAXmlr0IvTwsNDbn8Vkb/AgoIry4T+Zq0FNujqyM0drwzQjVCNnBy37fBc1GOZzFuKG6sfLfOfeujniX2bsgHZnd9/UDYkQCaLhMesAeIb/XsXg4ef25tNRDp8kOd6Od9yiIYvYkkfMjzu3MvDn5gra5oRu65MiXoyPUNBQRKgdHFse0WQavXWYGto7gpy8qtqFdLTN0c0o8F0tipKwgqnSuM77y8G7jrUuKu9RsjRfemd6bGdgFEtDDAdsXGHKH6oCjH6XoeE+1SMiItl2jlf+R4M6/VPrTgflCbQ//O26XXKqJ0+VMkLlQvgtMk/jUJrU+7OaPSJ4Mhe2U9uarDtEwn3Me9IlLd0WX+hks9orogM3Si66XWBVocZshrEKVNr0SYnCUbjn2yaripNDUBVFd48Z7TcV6oCXd7IebE+OZBXaH+E6KUDnUJxjb8MEVGg6j05RLUylEbSoqqK41+Bly2Em3qISY+xa8x9algtzryWBv/rKsIa1VJI9z8hPEpjXN9l1xAGaBBTKkBBaRdzT0KofXVaGqFvqcG+2ml+5bcScEm0cfROlKs8du4xaBgkLIuD4h82VhSqCNw9Ry7DtbTcfrPnyaXXSJVbY8RI8/5Uwo411t501a4it0UnAO0uvKQ35bK8JbiFbFYW4OI3FCAYAq5U9cQQMoXPICBjwsgJnoCqD1laJUk3BGoqxrdb0LpLGi33uheNpxBaixPp3ItlUlhn5Rp9D7OOgr8Cq8mAHZGsMm/Hq1qmcjXmaWx8myQMf4bnWUvW27cn+EVMjGfLfJ6J1l90LD7VbODubXqDihx6Ivppi1+CKTR9Dp6EdhxNYsMr2WE+Xi3jP9IkazGpQ/+6wyLthfv5cQcCMWlyQ3YRjMUB93RIpEx0Mrt8rrZs2eksDUFmMciYoiqqHksdJv0GWC3ZRqIyp3TkQfJw0vUm2s5yjWciq61U2t1Sbk5k9JeiOl+0S4wyR1GYYmTcSBE6EnUtFy4iw07wIrJXliHgQNv5PRMY9U9R9LTNwKjMcjqx+zs/dTw4emb52mvJ8A3CtY56rL0vBUKOS63ykmb1m9se3x26lwK8vK4U8uQyb72UDQ== 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: C/bpR4ZldaPQE9mrTysijBSJQj1cW1LKNYv/xgT+ZlY2Y0LPIXVUwkCm0w4sNGI28cvOif87jLLSKcHk8UzrlukMM6N/L0xaQg9UMZMnIPf9k8SaedeQ7dhODE18c9Eje3gLd/B2qrWTW49hxNdDjFYT1/egg2RFcATRMWih5gn2kZMlAp/YGOlGfBXZa9n29Rfccp2D0TfH1DPhDA6GNFfO9L4zWNcmaJXl1n3D20pc/O8U3rQn3rrMlWPbu04HLMKMiRKI2xZucNpeg12dN9/fOHyZvnZwSiAEitYsvTPzdx1txh3nDCj1DxMwuUsy/qxzOIhxbWtV5tMZawmv3umhcFZJDneHi+iACjFyBidEM2nDIAofs6mFlHxdNNaqfduL5P8EDhcbEjbegcOUYy6N/bh+pFqi7E5XEMN3oJsua2XlfPvgKQHxXAOcCRHO7nbGZeCkTyhskRUJXBrBfYCuBHDYmh8d9dxvNKrqrKF02AlTuR9KzaaXkLKvq22o7RpAh3i/w5f+IFiJ6YhtxWqdMdWRsjuznnCCYkY7rtD7blJb3xmqJhhqLsKJoNFiiDhB+ABUTGI1QniPLNfgePE+Cd0t7R4hKGBECreUGTEAqwkezEAwWVBc5bgLla7xPbZprsmwaN3Acj6bThFEiPj/NLzXOf3zcWMlI7/ZOaOG/8XI6QozjBHJcCrHw/ZMEpJAdl7Oajj+dNYC8uc9wRC3IZJzv+/MnmL+ICdOcZ7fANEEKBFK47FtyLG7NEVep3SWbZS7uPf21zcSHYklZGyb5eExr/UuRXqL5NgcHfUhDlAvzIDR5qkJnv/wYnw3iH0BDQKAjEkg+5TcALx1lDs7O64imm84ZK1zXO8w5593U3JacwsMcU7waXnLecB44GpObCuxIQUmsjfmTweYc+3/3e+X7FAhfJDiVo2NamAJoPlAmPEmB7ddnZxQn/hqS+l3w32l6q/NLVoCIrXBtuK4nFtMF1/ZMFUsvv13rHv3fbNAP7a1tZe22eJZ0x9Z6xP32VUym94AHUKw6wry2uoPUS7rckU1bO6jy8wtw9nmjvDflQTZwP/e3bejGJL1h3RsoGKCmeenSZtOW6YK1lyb1AoHto0FK9wqVfqthtOUh6E23GXVYAV6RtdtDZ/4NpdWxKSjKL2FlUcR4jHxUEOZVdlsBe2bzJKNi+ldZfxOjdDFlzbOgM5xm9B17Ri54oK+9yIjM2ME8fYCut8WOaX24DpPSH1buZV4FxKSZpC0qWxD3KfH4dODlliHokKUH/PFe/ge4lGUhQgk5mIRNdP+tQAfwZ3wP/qTkDW/osrrVIfG1cvR/XQ6xWTjWJ43YnV6ItRkrA7lAIjd+bq054gtjYy/MbECQrtEq1pYa8utFFQjRQAqL7ltJX3oy0vDeSYJJ7FsCgqgYiCA+ENnP9QxIp6hzAVI/eqjpqWQO6B9mcMEQM9lWz3k5O4YQ1NzE6DIfogQj0cQUbBADFVx7dLvgty7HemT4cO6kiH2J2b8GUlpI2S4TjR5ZwSwVtxcmP17BDZKyF0sMY20tEoxA4JXlN6IKmts8bzJoKdJhsduUptu3OSMtStDwLy5wT49l21fQeu4SJNrqbuGfMWeMQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29184588-65d7-4398-3816-08dde9ec5239 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:35.9611 (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: aP0FFS2GFPVSRNH4/Ic9mrSBhcfYBEmNVVRbtjfoCm41wy/Pymk/Xi7ODLCifOfTm3QzAjJDw7b9QKqRoLygJg== 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:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17920 From: Stefan Herbrechtsmeier Support the rev parameter for named SRC_URIs together with SRCREV or SRCREV:pn-. Only raise conflicting revisions fetch error for rev parameter and SRCREV_ or SRCREV_:pn- Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 0ad987c59..de301543a 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1226,9 +1226,10 @@ def srcrev_internal_helper(ud, d, name): attempts.append("SRCREV_%s:pn-%s" % (name, pn)) if name != '': attempts.append("SRCREV_%s" % name) - if pn: - attempts.append("SRCREV:pn-%s" % pn) - attempts.append("SRCREV") + if name == 'default' or 'rev' not in ud.parm: + if pn: + attempts.append("SRCREV:pn-%s" % pn) + attempts.append("SRCREV") for a in attempts: srcrev = d.getVar(a) From patchwork Tue Sep 2 06:45:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69388 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 EDB55CA100E for ; Tue, 2 Sep 2025 06:45:45 +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:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=NptdJhN2; 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=Vc+xLcu8BKRZd1f3roNhclDGfwVvnfB/qghlzm92OSGMcBQdhbDd8naBPgtJIYAPOi000xqICqbfs8UK7564Baubx14FiSzCIx74fxG3ToL1DOXhx8T1yVLd4OjeGmEUHa1lw/bQGV95I+ZvlZmCfltoBxoDM3lACyojeGcbcrXm+wACy9Qlbizh8D2AjTOohHAjOOeIZwxAD2+YccH/0EdC2TpgpxHc/l7h2USJg8ku/mkof6KpoLBir7KBG+1xIvN3gnQp7igJrA9PZQNtKH1abIbG94ZXPzKVatfO0OBgamZLQ1JeXOlMw3oUX3JXcOseFQFXUuEsCsBchJQETg== 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=5a6olMHD4WuWr3Nq7dt7IuX85GSa0mWnnLAdml+zh0k=; b=TbeIbcNvx34qjBFFrPOj7+r7OP/HCwOVCXID9f6OLzRnjeKac/WxLUf6ybIVZMt9CYsO6T8TEfACjI8Cv/kG9t5alrTO3NhY7AoORBgi9TEwLGJQ03WDsWpflCLwRC5zk5dcw61FOltmz26L8hn0wE+ER1sxAE6SHZuuPsS3Ltx8T8gjZq2UX4nML4bdM0XgMkPzrqR7XDKME2O7Sg2o1G7vPqv5VAQS4hrwp+hm7W3C9vrEJQOpxIwx+eNdFKIZNQf/GxoxAmyMUNYK+4PTom3M+mMzIFkAgqGopenIOv3mb3/pZqAjlC6FuhSvDsaCjTY6Vl7MbLM629BN2Fnd8A== 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=5a6olMHD4WuWr3Nq7dt7IuX85GSa0mWnnLAdml+zh0k=; b=NptdJhN2fSZL3/xD9RHHX8FK/rF4rFXP1a3AlMStHkgzmQ/VaG6xYtUCRI/kjoSiBuyFYrPLidXjA7t+/6QTSJWeyIx0z763gSR6HVd42v7V5E1QuuaKFglZ+oIZvHXO4sR8yNUN1FzjUaBGWjUl+h4ul+nuECbnEWihXkTqTpxdMNxODen6RnOxthz5h9Kam8amcWo9z1Z1eg3UFXvy7rF9CjzYt1VQuAZlAq5jWIPjqp5Q5BYX2bkpcMbFfx+4u07h1xAY9IjXKNf0Utq4MvjQyJOhe2bRRqPt2p0ZyRe3HOpgx4pdGHD5vAUIIlWma1o7CijUoVDtehd408stbw== 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:37 +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:37 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 03/15] fetch2: git: replace destdir variable with function Date: Tue, 2 Sep 2025 08:45:02 +0200 Message-ID: <20250902064515.30879-4-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: ff38b2c9-beae-46c8-4ebc-08dde9ec52be 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: Ys/xvZI+k1oN54zR3ME/2R+EPmfpFuodtIfP9YWDssSZiglo9lsvVGPXamCGDqAU4510AjkBfHW4hLxLh3sO+i46IMj8Mah4n3RlDDqf1t/Jxzhx9CUvIwIvOumGNTnmYsXNd3dwvfekGIr/SF375534+fPFzNmfo4aZXRhYqypsKeudUjHb5IHRBLQarT4A33q9Ovr8vN/MosdeAyICV056JLye2Gd/mlRipFV0hmUs5hVYnnV7zvQ3eAvMn6Sg7bV9TmO3OnjyAPod4XytZYiqikrogAMU9LtVplwqYR3kMPGOyX4RWMIhZyPLYH6G71p4ewz45ZUacS7cjm1xMwE5EhVPjwUn6fJC3/BcsVnysxtZhynz02qM51hTtyfm/4VxBa4BJEX0M1vNlwKV08ur16RhyD7FKp29VumNQWYcNkmbe1LAb+MsuU1JD4YmcFqBFzsJbVx+o6Ydbit9XmIrxs8n2W4/SCkZ78kuAK9OVvaOa+kazCTqeFI7Ll3nouwgm2yGhIXybFTMLtT13OkhmW0+0GbSqtchfEUofJDKupKRWHthSQLNLf+TO2pKoE8U3q4rqB0Md423Ft+TKFhC9vvzO3w89wPS6BGlvrq4lT/d8DQ9Cy0mwesFkSMHt2U5VrJUCFCGszgp1tOzyp+uZNwWpCGgHHJob2iwY3U9wDa2v9orS8RF3CXOuJzYOQWJXeubaDGAYxZp2WLAxFVXJ8adKWD6FhSlHgjsFbDgEteHHRwhICeho8nwOwyoW3mtTnl0MuspWO7f+Y8iv1OqYqy1noMbaglN0zxTYXPxnWof+74JspTFO5uZ5fJw5vWAeR5FkUvHzTjTiUsSB7EVEZIs2ABVkpwCz/lIQzSobGadqwrC6TY2GRE4tJ21t7NWN67CqLvqqMHZbSahNoHps85SISiP3RogVGNwHgYHMiiVZlD0d2z2C00mC8bqnsZ6pH4E2mQyH7WjixlXBA7WsuDENuJOPdsCDaYFIicQ3gSzSUBylRuSV7bYnYKzLYhUTGfcXkOedvNUAx39J8AvI4r83YeN9E6cwbmFGD3E1iie80lAoiVnkZv5mv4PHm9K7Rzq/6PXpqT6xoi31JRYXqUatM3lEPd4gHh6Tfc8EMTc54IFwtShpoEmuoIxSRpkswmFCKDNEZuvYiReohCh9ZNBq4FZwLmv6F0nIywyxiMFFJBjWSryvW3eiRajMXYf1sXJ9PTgvtsCAEjWR8jBqNMrWkX0RXiuX//s4j+HOx55u6JpxQBzDLukJlZCH+kmSBLJ+taiCe4u3z+I1pWjQhH+7UlvvZic9bxW6Ib+EavSnzzaQCV/9HkbGU9G5H81c0T7oWaWOXPUYpTtNWMycdtH/GxqEywz9GqE0PaMfYSdQKhA9+hxayKqCRnQEJS/lJrUeIeOB/o4QOFcgCrkWCRw8/g1O+vmRJnlMGbGFifKx/irwyA/rwe2ocK1oSKIEt/pWvrAobSJ73JLbw== 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: A22DTy7ho952HThVyrK3Syz3blEgXaxLRo0/6LzumDiYFGEG9XLndZkoEIbEPPkiVb+y7tt7e/WpHbwi5naGgTcLGVsxFRLBttsA98toYdIauSzoWWylcwelRowq9+KyBi3AqTEorMAUMDeo6vGFUNQGFExtjQQS/nskrfUbjhsQCtsFWnlhEp5tMRoI17OdMqC4CQm5w1e5spRewWvDL7b58Y/3ziXThFVSrhtYGrN+KvrgxiCsd9UYUdJ2Fc3yI19zDSR3Hk/BYBTituwWTuQZg5+kBweVTj4dh0pvev+kjaXpBmSxFjz6o3DwsSkSo2PTl4Pk2nHCL993XSx9oyHhMWGopc1m+DB3AIl2sA8yZ2BSweEMe/sbXV6oZIPMtlHcPGXl7Vl7amkjFMxBeI9/g1ZSPhJm4EedHkqLfylBaPBthgLFYtsY2kg80G226BWuB8gj/WlPN/GVRT139xisCnz9RX6bso7/p4z7Eir0WZwPSM9uqM694hnEVkwKQKJSpLv8lFKA4K1c4uk9msMNJGOnn48u4HENvqm56d6V13pQCTJ4CW3gcuBPwe9vZv0FoqPEV4izpmqAqVEDu+BDJF97VMQM8+kUo4FqG2JPYZCZAR6EUMfmEAXGaCpXKM9k73hrTd+/Qpqta//8rZLZbRiPb+g6aVr2X/0ruE4irC+/MEJ08X8wuzlSUDVggqsKki1CRSMDHcAcn0P0MQ1GhxvtsSt3dNXNXyCtx4HYeNTJd+gyFfvGY8Mw6ZHgyUNO7Msy9DgKXJkv1M/03RWdwQgkMjr+/UOH29aUv4Q3XvDyEk9q8DdfVDFMDTVNRfBWyB/ylwV+Fy6qGIYKo2zmr43YwdUzbaBZ7ozfuWdjVZT88GMhwmDRYC8zJ2hFUhR4UCxnvz0mys3UhKnw7m2mfDyfByYpE8Cs9ckeXpy3bET4Z6kJfceBg+44A6NLVC3X2M2ld9O2S2mAZtz80Nb5uXK9PGoUgqW25ngbcSWUy4FDXHfugjdXJRyg/ZT0xfawkrmpkbJyqOVyeZF79D2DkdSvGasEiJXKLpzzdH+DevMHAMn75+C7PHmUGN+RceqojzA6J9H8kslwZki0nU7gcuqfOn3bZ6VTkmlkqorccVdaZIYPZBIzFyqKBOjLWM4rFsgG4ytz5iVD/s1GxY11V1lVIBtAVKZ3Sp5Ii4h/tRLxFCI2fYfVmf5pCYt1RQya46T9pzCQCzobCFMFXvhuq6+JHWmbEZMCb5pU9Q3P7x2281K5cUpMDCCJFQjCDsbLQZ71qO8ZCqNiRIeT602aTtB00ZgYtjv+ElqxcFE88plYRuUqtsooxIDj3updHZYEi4MDZk+L7iUJ2RFtRlLBqRgyc/FN1+v93UTk+j0e7LcldrOGd4wNdy1I4dMyh8+RkqVL1MYApxKFkaI2mnzfRprckaXk7KQ8Pb9YeGZ1QMlVPB90rIKSeUXYoqdxXqlLI46uqxp/9+mrXfAYqak9DXhb7X14lskNVYec4S1rZ7KArXP6o2MlkAuBy0/bMdUFQdAlYiz56wp50LIFhZFPy+1/hbYM8ePT0LKZCtgOfs+y7kJ69yc37eRPdThH7xZRscmdJ+FtKtI1e3/3mg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff38b2c9-beae-46c8-4ebc-08dde9ec52be 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:36.8019 (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: 2KHCnwU+UO/QuxExA2kD3Qa5PP3StDc5MARuLX32bjGsiYIYxkKyN/7u74P4nzQ85PNZ9PPnJs42i5wtth90ug== 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:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17922 From: Stefan Herbrechtsmeier The destdir variable of FetchData contains the volatile value of the destdir parameter of the unpack function and is only valid after the first call of unpack. Replace the variable with a function to make it independent of the unpack function. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/git.py | 25 ++++++++++++++++--------- lib/bb/fetch2/gitannex.py | 10 ++++++---- lib/bb/fetch2/gitsm.py | 20 +++++++++++--------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 52fffe21d..6d3bc3447 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -656,30 +656,37 @@ class Git(FetchMethod): # The url is local ud.clonedir, set it to upstream one runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, shlex.quote(repourl)), d, workdir=dest) - def unpack(self, ud, destdir, d): - """ unpack the downloaded src to destdir""" - + def destdir(self, ud, destdir, d): subdir = ud.parm.get("subdir") subpath = ud.parm.get("subpath") - readpathspec = "" def_destsuffix = (d.getVar("BB_GIT_DEFAULT_DESTSUFFIX") or "git") + "/" if subpath: - readpathspec = ":%s" % subpath def_destsuffix = "%s/" % os.path.basename(subpath.rstrip('/')) if subdir: - # If 'subdir' param exists, create a dir and use it as destination for unpack cmd if os.path.isabs(subdir): - if not os.path.realpath(subdir).startswith(os.path.realpath(destdir)): - raise bb.fetch2.UnpackError("subdir argument isn't a subdirectory of unpack root %s" % destdir, ud.url) destdir = subdir else: destdir = os.path.join(destdir, subdir) def_destsuffix = "" destsuffix = ud.parm.get("destsuffix", def_destsuffix) - destdir = ud.destdir = os.path.join(destdir, destsuffix) + return os.path.join(destdir, destsuffix) + + def unpack(self, ud, destdir, d): + """ unpack the downloaded src to destdir""" + + subpath = ud.parm.get("subpath") + readpathspec = "" + if subpath: + readpathspec = ":%s" % subpath + + root = destdir + destdir = self.destdir(ud, root, d) + if not os.path.realpath(destdir).startswith(os.path.realpath(root)): + raise bb.fetch2.UnpackError("subdir argument isn't a subdirectory of unpack root %s" % root, ud.url) + if os.path.exists(destdir): bb.utils.prunedir(destdir) if not ud.bareclone: diff --git a/lib/bb/fetch2/gitannex.py b/lib/bb/fetch2/gitannex.py index 80a808d88..dbb74e35d 100644 --- a/lib/bb/fetch2/gitannex.py +++ b/lib/bb/fetch2/gitannex.py @@ -65,13 +65,15 @@ class GitANNEX(Git): def unpack(self, ud, destdir, d): Git.unpack(self, ud, destdir, d) + destdir = self.destdir(ud, destdir, d) + try: - runfetchcmd("%s annex init" % (ud.basecmd), d, workdir=ud.destdir) + runfetchcmd("%s annex init" % (ud.basecmd), d, workdir=destdir) except bb.fetch.FetchError: pass - annex = self.uses_annex(ud, d, ud.destdir) + annex = self.uses_annex(ud, d, destdir) if annex: - runfetchcmd("%s annex get" % (ud.basecmd), d, workdir=ud.destdir) - runfetchcmd("chmod u+w -R %s/.git/annex" % (ud.destdir), d, quiet=True, workdir=ud.destdir) + runfetchcmd("%s annex get" % (ud.basecmd), d, workdir=destdir) + runfetchcmd("chmod u+w -R %s/.git/annex" % (destdir), d, quiet=True, workdir=destdir) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 5869e1b99..d9ebe8d18 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -205,14 +205,16 @@ class GitSM(Git): self.call_process_submodules(ud, d, self.need_update(ud, d), download_submodule) def unpack(self, ud, destdir, d): + subdestdir = self.destdir(ud, destdir, d) + def unpack_submodules(ud, url, module, modpath, workdir, d): url += ";bareclone=1;nobranch=1" # Figure out where we clone over the bare submodules... if ud.bareclone: - repo_conf = ud.destdir + repo_conf = '' else: - repo_conf = os.path.join(ud.destdir, '.git') + repo_conf = '.git' try: newfetch = Fetch([url], d, cache=False) @@ -220,7 +222,7 @@ class GitSM(Git): # checkout dir new_ud = newfetch.ud[url] new_ud.modpath = modpath - newfetch.unpack(root=os.path.dirname(os.path.join(repo_conf, 'modules', module))) + newfetch.unpack(root=os.path.dirname(os.path.join(subdestdir, repo_conf, 'modules', module))) except Exception as e: logger.error('gitsm: submodule unpack failed: %s %s' % (type(e).__name__, str(e))) raise @@ -228,28 +230,28 @@ class GitSM(Git): local_path = newfetch.localpath(url) # Correct the submodule references to the local download version... - runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=subdestdir) if ud.shallow: - runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=subdestdir) # Ensure the submodule repository is NOT set to bare, since we're checking it out... try: - runfetchcmd("%s config core.bare false" % (ud.basecmd), d, quiet=True, workdir=os.path.join(repo_conf, 'modules', module)) + runfetchcmd("%s config core.bare false" % (ud.basecmd), d, quiet=True, workdir=os.path.join(subdestdir, repo_conf, 'modules', module)) except: - logger.error("Unable to set git config core.bare to false for %s" % os.path.join(repo_conf, 'modules', module)) + logger.error("Unable to set git config core.bare to false for %s" % os.path.join(subdestdir, repo_conf, 'modules', module)) raise Git.unpack(self, ud, destdir, d) - ret = self.process_submodules(ud, ud.destdir, unpack_submodules, d) + ret = self.process_submodules(ud, subdestdir, unpack_submodules, d) if not ud.bareclone and ret: cmdprefix = "" # Avoid LFS smudging (replacing the LFS pointers with the actual content) when LFS shouldn't be used but git-lfs is installed. if not self._need_lfs(ud): cmdprefix = "GIT_LFS_SKIP_SMUDGE=1 " - runfetchcmd("%s%s submodule update --recursive --no-fetch" % (cmdprefix, ud.basecmd), d, quiet=True, workdir=ud.destdir) + runfetchcmd("%s%s submodule update --recursive --no-fetch" % (cmdprefix, ud.basecmd), d, quiet=True, workdir=subdestdir) def clean(self, ud, d): def clean_submodule(ud, url, module, modpath, workdir, d): url += ";bareclone=1;nobranch=1" From patchwork Tue Sep 2 06:45:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69386 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 D977CCA1005 for ; Tue, 2 Sep 2025 06:45:45 +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:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=x8Bhj3nA; 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=OdgesXUL5BcpYH9zLMTtyHpSLVc3EH53koM9C19dNaVXFhL2A//NoNy47xAfQOZSs3SGQArkZxZicD3oGZeWQ4b6cYwiIP3ZbcMvYISs5QF6xOwRHdC3mSLiVuN911yA08Uc8ff1i5VJQKnLcBmkO9xT8oswRBz3J5hSK/HeRcbOTic7J2OxkWL6NA1yenFLvQsNWNLSkoxDQDJmSIzFrFzsL6PvvtcBnOWw55TfEa49ATYDFmznObbXYFVBz57Rg6XEHTy394QobpSXmOkWhiOQRiXAkQLW37lRfHQ0paPko4hEavHud0LsbDp72EcgQEObYjPzfWAWf+jkd8+ZTw== 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=AnZlwG1oWx2jU7jzpXEQzsgFXzpKypteHPJV2+WNi18=; b=yp65CZtzXJFkn59bZM65NC8+HtnQTjFGkmqBb9BFylvJwaVQd9XnvIoFk6OAxdTeUO4OR3UWiVf1HTKx8IxmFLYBGpHStUhKzTHu4p+TtKVe3SppQxwWKyVOVuec2zosixp7aERamzmCbf31cMT7eje0IpUbcSWn3RZ74qzf46YAWa2JHw0B1zqsJjfk/t95cUk+QAf6u0HKp2rdn2akVs1zeGeVnlb7vzaE+96Tta6yl7Hs0XyvmbM1tXU5FCqapsl9q6mhWy9VAeVndRIcVroN1o6pN6He8sGhcO/pZ51a1Ws98IPlBvS4TcJPKrQwGMFbFgD0395z8mKieSQ+ag== 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=AnZlwG1oWx2jU7jzpXEQzsgFXzpKypteHPJV2+WNi18=; b=x8Bhj3nAgG5K8JBUR3l6NkdbLmBtIJ/mhJwfhaXqTf10HwtWmGvW7QdHdX4zbggvGozZ5cvZR/eE9lqlPTkQHaMqjwd1tyrJULuTzevQpHbufje822XdyYGG7wnVZJgYej2Rg32VLHrDyUa7Kn8+zKn0DXR59+oyTxBp7zf1JMl7i5VfoxgSgcMyBPs4hKBUiViT6Csh1QT+vvbJdSzRXps3GWarRzy0JkvNxTiPbqSmQXbDgbInbRPSkbKKGTr7zDJpFtFfJXbRkiFNepafvj9wYC/Ou4Ob+S/yyPB94ldfRpSdLpGd2UYzyXyL6HIfAiwdqQQ7C7uCBHfyjIWY0g== 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:38 +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:38 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 04/15] fetch2: gitsm: remove dead code Date: Tue, 2 Sep 2025 08:45:03 +0200 Message-ID: <20250902064515.30879-5-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: ad205bec-f8fe-4269-5d10-08dde9ec5304 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: 1tQyC3GUhuVo8izrNXpvqmngRD90fCiLnY51C13VZm+eMuoHS+TaD3mK5rvgMkxyOkUKgcMG2Kd7JNpgeUGGir2RC8ftfWDBRuQxsUYpB7U6F8DqmXtfWGDOCmVfI7S9/932upJhJTsfOA/+BoRcD4ZYj4ndkgIKDfIHvYM96hovqOOudDw6BNRat4T89wPwASqkjT0ZWdZSurIGZG7gdCp9WiwNiMRh2xRItWQ5Dkviyc28uSsE7D2AHma0K3AnI+ErElxC8ISopxEGQe6pLw5NA9CzbDPCpXrWtKFnvllSPuqllC63ylaG/dZnP3C9Ww+y+YO3rh/0j6rfXNvI/vtnHZDy/WwYzz9Ns7uKmyFMjaX1XE0NfU3qf6CW+Sz/pF3tfNOYrYlcXSumm/+Ls6CMtlKkfUqqpPZ4hpPB2KV5Y41yysIP6DAOsFKCe59MUME7vrdzmnfRPbjk50MD3V+gFawyBkxkbn2Dc+VQRofG0AtEY0TxEzJKJ+oi/eyPZlmlmuYyFS36A5/v9pPnBOLI7Z4SaJAdzNSdHideLtoxjefNrx3tRYye4o6H35PdWYIboHpX1obwLlSXBjZdqBPRKABdue1B/vBAc7OqBlGDtckA+aWURNlF2bE0Cz738KOQTrOpcocUw/1GQ1LFYbWf7iVHjikMhQLpy/RDAFX+V+8ZlvNElQLlN54YCkh+UfmUIUizxSNDlCVPIGkVTOBg3n6MNXHBk+amzds4ybopDAECR0vHcHIABbIyIkq7jlITzoLvmMkWijwdedrEJnHr+BhkL0QWpWADx31XWMpz5Yn38zFMbpOmBWHiKSn5qAAxSWjSU47mI8kSx5NNRepdOXiR9SA72iqqqLaIbE1AulbATCi9KC0MpuTU6H4Sp4y8AI6dOgbcCbGt02OQnXW5E7n0TchVxvQEMvbccfVxptKWYh0AVT/u7t8OOJ3q1/3Y/JfV89Py64pTd8bH6i4gzTuEXWbQj5v4rhxKEfpowV2wFY6mslB7lZyyka8x61WY0NSZsPU1z71Z0iNcdpvV6/1vbF8bXt+4wVpt8JBdmdmGctlAPZIP3FaB7Yc0QIXL9LIxoC1DYGzwyylXO2gS0RgDkfjLlGAFvQnz5/iBwPF3UCJhmxzxkZx2fqjhaIYQsUtAiGcKugcK/qiipewWrvS4wcTECN4jiPsaKUSxZ9sWa/+nddtmHJr9ae0i+/+HcvTaevaPs1CiVEN/46KRXF4phWMLkK2VQqi4HxIo5VcHi/9fwMKKtgnLMAdR8Vc3/5jb0uKF5u5k0dzY2K++8219q+CO8DsVP79hQc6hewoz1j0Qzrzg2o6ZRmvXqq58zsCslvIpYDcnOAMDA8O+BnmjZSqZoljPsd2wSOq+0yRtEUXjEd2LNYlew4M1SpOign2rFLXV7uZZXzzaXsdX3MJPF2YPCPSf/nNSlncWarlO5H6xyN3I++bic17eZBtVftypvu8fJHK4VObTgA== 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: NgUeGvXyldm+uiqXJs3I0Na5pZyuHkPp2S0rOcWahX92i8ptiI9lIv50YVn6kReDOD85Xx8PZ02ASU3AREwpaO7zzP4OT62UJw2/8eF/t7JQv9LZ/zuho6zutEV24oZuBB0GRn7yTMSIH3X694BgGZX9olTgwYtEgP7SubtwGoCiE8CFN0xkUGWJ09mOHylWNAOsWFfwxc1EKkOe+LrFTz9X0M1aX/+g+BTSLW0fznKpX314LILOzJyuqcdxkozkyNIy8nZz3g1itzIAfqmk51bz1o0jDdccQ6M5+upXNPHhyHe5E0pDv8GA4IQBInsdgLhrMPA1CKyeBc1qC3dT5LQiwi3K4PlJ53/3086tpFhiAvCnDNyAV7mo/iYEhsKweIGXgQZQ5t3SbTklB5mo+8zeAv0TS379B9bALE3/o9TcM9q8dF1zxx0bdYk6aoo4dhZCqTCEzXEqMIQS+Rtx+IKju4ajkBpVAikPgm6EOZVYYyeqT7MNFaKCvYJS0wTnZWc9af/kHgGEbBtD7nLESvRWw/XOlOqTAFKrgAAaVbs1r+tYl8Fw9+pXI4nyi+hfjSR2fGoqpyI7UsAp+qhXXadAO+xAAM0p4qzrhg1c/TrElJpIP2YRGzEHlc4LBEZ9uagP0Q8r3ubugAusP9N5qYjXRf2OM3dYMlCQPENR5NMYU8cWg+aS6WReAb7cb/WMwS+pbfatxYh4s3ZA5yezINAOrq24GvLQy6ikdL4cPMUqPxaPviR+P/Rf8Aa5mxYBD/AoRwIesL30ccY7nVskdFPoZIq44Iv94cmnGW+wkORF6WH5O5bmomvKPEJk7NmwdIJJB+Ty1NF0BOi7GT+SiVMZBt6+Kc8qyrhp88A7q/97v65dfZeKBKpY+0QrS4e250W0aA9JtnFLEHq7nga7FXKhp5ELS1A2k+qoeSMgmZ0mlWixznLpYvlLInZarvE94RbCMGRpSxFUD6y6SRxktxoEc/krlHSR6yzPoyW9rWeJZN4nKX9NizkhYjC6pDuVaVkLP+hBQGuQ1MfYurAPbHaCfuSpwDqMxUpGX9Jw3OJbb96xBdp9Nu1oTzYLmeLPjionLdUm3Dsx2JB3/bsml0zO8lAJixFcyi8OCnJ0z3fS25d0PBu+pc0uHxWLvGVSlwKPJswm4obHpeLhlXriCyHIvtr+v4Vl6IeIID/omoM2uadqa/RURmA8UlGWlni8LctoA3FdXUyZ7Aj1JuxuK9Q+Ei53p3KhO4UlrwAvzrDnRxXOVAHllXynPcHPzFPJ6aCIJzpe9k0c+bopv3PVrrks8angNbYIeZ/mHutc4YuE5PHepzl3eSMd171Vdtx7ooSfeGl3dBxN19WrWPJjWPPYBWHoei+jNsTw30x/P33EU1lp3n0R8XtGnpkICUZ6i8s21GhujD/Wy/c+HWUOPtBt+6mvVFFBscn8n9KsS9Og/Sxq8P/jPgrxIErIjgMjinpnJw1Otm1VVSWZcUG5edvsBBbLlRMbYXxjH6BSdlqmHk+TUwuyFKtY/cX2nxz7ke4afdlgNkiTzxW2l3XnrYDZFerNw8bI2BLbHezMa+3bbGLbsLRVTe/CP2Gc2uH+rK+OZyXpURVdI7/Pw54SXw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad205bec-f8fe-4269-5d10-08dde9ec5304 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:37.2780 (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: 4sBQBbqPu3bhDtOV7BUQlXhCk94YyjcgT78kgeb6O8TZzBypNAbcqWvtVIzuLtCQmKHiVUA9DJ5+ZSFx4o03jw== 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:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17923 From: Stefan Herbrechtsmeier Remove code which isn’t used inside the project or the tests. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index d9ebe8d18..9baefb3e6 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -218,10 +218,6 @@ class GitSM(Git): try: newfetch = Fetch([url], d, cache=False) - # modpath is needed by unpack tracer to calculate submodule - # checkout dir - new_ud = newfetch.ud[url] - new_ud.modpath = modpath newfetch.unpack(root=os.path.dirname(os.path.join(subdestdir, repo_conf, 'modules', module))) except Exception as e: logger.error('gitsm: submodule unpack failed: %s %s' % (type(e).__name__, str(e))) From patchwork Tue Sep 2 06:45:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69391 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 00BCDCA1005 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:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=AOAajoFF; 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=c1XtzgihZq+k+7O2c4hbv03puKWG6YTkA7FC0H+8kHBujSgUfRmR6HzC02YchwLqbVT1HpYjCvCsjgXzOmsKQlrxXAHXc+BfugeDXHuAIY1VlinXj+TDpXoBglwqKzdk9ysZvXRpilMjyx6p3RL9MuCUl+1I18qyAcy9rMNuHOjgepYGCQN2YIo4ribvbN4YRQUZFryELPUGC3MB3d5JDaQ5YCCRa2JbmgNiSGt4/jsSv3+Y+3S5lim+XFr6PkkUvlYCG3akwOltdVf5SZj6TEBa8klDAm6xESalONAXm+ePLX7yBw5R7rmRb5oVifqXL028QfWkmlIoTeoMEdnjiQ== 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=hfMbCnDV8j2qBWWYwIPunXHgPizqJDxK9MX4d+8uj5A=; b=aPu0/nJeXU79GCT+t9w8t6CnfFQztRbxIDEDvxnfkAPUbYs2xj7Of11PhpbzY6oXqvLx+3FSgB7/71fYce81I80mYuxFwHmASI6Jua/Mc5AKu6TWUtE+13OPMeTo6FDNq1w2wJ+u3TGeXy5pukbNmfYPuj1hCpJvsDjlamolPPyrdK0XYKJwJ8x4tp4/CyAemMNzXAChBBlOLUTuxxTWMh5zd+GLm2VP49dkzZN+UQO6MxoTWxqubmnsYzvVmKxK4oEyuy7AFUMqrJchZdrDTT5BUYQsi62cAqV9N4LNJs0Vp+E2y2OAtEiW7Rlo/vX/XSGzYBa+9HfEJ8e07AtbHA== 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=hfMbCnDV8j2qBWWYwIPunXHgPizqJDxK9MX4d+8uj5A=; b=AOAajoFFe6R1FU0njeg7G/1yPwVd+dT96VBX7sEinZAcwAksW8nin5ddFqaqgNoStCoJVcPlIrv3QtHA3/eXnIKsuElie2h+G7EA0v0P0hbqNvY/L11WSMFT7ehztlD1h5tzPLS9sWbAxFtxWrNomkdEhbKm1eBEIKfZEe4P6vrs8avnutyCGFPIJ2ZK1Vob8eJT68RFROvzmmAK4v8z4g1nun06/L49hAVCQQJs71RIqptyE0DxeJUr9P0f44EQQ7SeYcOvBeOpSHUo+iflXXNIdomUllafO9vbiWESmirsDLEeQwuQIqmGn11B9WPctxr18MOcHlOxcfI6FLsReg== 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:39 +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:39 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 05/15] fetch2: gitsm: remove redundant set value Date: Tue, 2 Sep 2025 08:45:04 +0200 Message-ID: <20250902064515.30879-6-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: 121ac950-f7a2-4e95-404a-08dde9ec534c 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: viFTZuX3DTkYMj5RTvq5J1ThnGmP9u/h743t9+6Bkh+Hs4Q570mjXB6pBbqeG5AnEoqPhLTD1dlU0bW63Zyi/flTv4S/VqpbhKE8sfF7HIEXjAftnAIgZ2kkuUhMQAt+iVD1r7wLTOtChB9mYoKBM/1sU8f8aOSsE5lQpUWOm6ZUfX7QBD2+OopaTcRL4J822NVUdParVn/iJVoS/ykIq85Am2xX1egBqZ9e3mAqVc9XJzMqnHAZwSq9ICc0HyV0fGrU7wf6lbKV1ADuS4sLU0sv6gsU3Hw9XhHJDFdu68QuwkYvQOy2I0OzsAfp7xbEuGt01ooK1DN9cfFUH3jW2b0igh+MPAhDaRSu7Iul+B29fmO/HA+eSI3+bbVyk2bZnkKsVSzSQfSu1t/R+5UnXrIPayHX8p+Xj8/omOnuX1s4fCBUVaIV5I4dhwJLTXBLHLN2q+j9vXwFIEDYIh2zoe2k0Hjb84fi3iUqrszqFtYTTIelE1rcgA5pUi7JKKIGvPXfgsLNgY1YT4oDEWGkYJx+MTwQtsD1xvvWQ1ZQdfZgve73ceM0QW9PAGUbSiJs030JuK4EZAYlfv2aiLiKG9RD6wZsBg7lkqdbMhwLMHYsTVOpdCGw6yQ6FW+4qN9Dt5jweKPhbN+2f9A0WG7GxoKCJvI5v6ODlwjXkDxQWVEksm8Lb0kwtcftYidbjrIa7YIzizlFB9LIxnV/U9YtPQZYTQ0K8ed7ZqvYHsERBMCf5jmHitLTMNLL05fzb8lv+CKu1kkREqeaaZm+14kD+qLqDe/8ZhXbfwrU+o53pSt1STqzjJh0kp5uqrWwLCltJQ4kb2iXXg8P9zOJFT/pKem7bVWBo/2WZQ2kJEw0opaFePBLC0DbZr3mwIqUWymtS1yBDHeawdOi9muqZcH1Ts8JF9nqPR6v1+H0BL3H1LKyjIAaQGzTwpgh4fpcj70a+Yi47VWjo9gQ4u0HN0YrsVyo6OaJBnFd8/ofzOgz9qRN995vF1BI5ZQoDoavLPCIXZHNFPwhDs95dLg1VbTlehUUY9mXCH6w1yC13XxJAOYhWqhBRumEClk5aSp0+MvxqujNQcSkxlR6NkjosenrZytC1vtSJP8znTQxfPc1SUp+T4RCRHa+qGYFmdTVXHoALK2yxTjh16UCEh/Af6NGck9eMcEmgobP1bZJl4ICUxfvotIbYM49JxbEfVFVdC7spkleOnL47GQ/kmRYdbLlUS2pdO+/PBMRJjZp22QrSzijDXte4KQrkz3sMymBlE59KV83s56OtITn+Ls82A29Pj28boAOsdGSKrxgPLtlsxEAU800kK4LzX/Ze0vPHigVaWwlEpBJsry+WclJmjjrFVmQkNQeumrT4oriLvhlcdVJlsR4eimiDGT3xHRmIKQZaoLsUPZaaxmMxwMXxfjzyW9wuWhPtH1jVUEkLDf/h2nmLIW0LsMnNDtJKBZCRlOKl3Coc2kkWQPMM7WyNZ7rfg== 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: bVE/oQfYPtk3kv68UxT7GRV7d77EkdZnmliycm7uHF5lAOdKNenIA9jBaIsQ5G9Z6Q3v5JTtwMG1X1qIzV97/Db066Cr4ldCvnwUVxj0h5oVf9dFoBAZi+RtjrY1zVmV6oLQhA86q6Xr7NJHMgKhWrAfJhOcGLvtvHDedSniQiDsrwUJo1M7eE6SKeD1OqQOBht94P3/8f5MODtuP30f3vM+YcWF1DSFYtWiLpcW3cnItWAtkOlqMjOLhsvkzxJ+u+zMhb2ZJAtEkPUwCgocvaWjIhQkfG3nsY/IEnQaxp/U3Ovg8lTMp2WqpXrla1Q2UolP0Orb4KMGgWiOI+o1QKd++QHcZzR7B12CPuMz/mOzRn5oFTOQLEQS21VFv3eazglJakL9gpPlOvHGa3SRtJ9hUQL0ollG2bAaPgZz29VpMqMAjVGitEVIOVc/eecXbTJoPpy8+kXQbm9c0Smd5dUj8X/wgm2Y8h8kk3NPde8mgjmiGHcFAQEzwXD3DEKMqBMDJxXEwS1FzAajZ21N816TonVIcXe88JIZrOJvUHywDhDNm4tdFIdxs/guM1dd28KaOXBOOCu+MVt0GiZTwcvYD2vPyNYzjmPvtst+aTzVGNu5e/NlistyaW2RlHl+YkmfXQyUuTk8DQrAq+bRQxrBYplzcKcF4/07S1DSkUkPXkc3bPfYylmytaNTeuhlsJwkPk3R0fxBpubzYPPMKvD5geks4E5+t6QXyg3m9iUIjDuczBLkOCwlpmfr9rP9SGiK/KIgkEUG0S87rMXD3e5isG9ZYIg6CK8iIhf/9Lvsu6kIhYLAvsm64KxHNmU89b/OBMP6m1o6yMa+buAIRcxWGlPw0c1S7Q/QSZi7sEuBD94H9k5dmM0//VlTK4f22p0OTHyjqTMuaDgizX/WMbrfz42LY4buR/eiMYvuuvxaoXodzGvUsRfwiwKW7L72Ze3NOq27ICqymbZNWlnUajyffNxlvyFbtT7p2WU8uFWElQ3AWYIwu15RrhYKNPF+OOBoO67vYNlNzIU/+hw55EAe9lickcAgFRhgUWlz5yRhsrNMbSLx5OvgbsDM8ARH9BhIQUkecSrJZZ+AGG5CKLKKkyt+SiWgHiXKsZOnsjgx1LvNwsVz9NYg42bB8sEJRjanmuIrsNiJcpmEpKtc9P8qmHVSLhm899dJSVnYol4vcSSHTnLhRNENKZj/TfRXs2iIaAQdpXHwZIz85fN2ZsSYTYx1n+VgisvHbUW5mV1QcwTTQHH1Gey9KvK8HAU8EtHK3vzKvMiZTymWdvgg1y4uaPUcl+3At0cbNuoInbONacNdGlUYSmJ06soikkuBuVUB0aruQfB3IXaDcTaASA2ySQRiwrTTup7iSneL/fAnHTuQIYngaA6jEcvIQMZYAmTQWTY/9TQ7tOK2hD0MLaHArjwLCTog56sWkWJrVmxgQtUCiB8cfEpUGP6SZzXKY7Ir/rJ6g4kMXkMbK0OmGC+CdFPgTEOdGy2x9/URKdUuH4cs0C5pSUIUNK0lU8vUssuSb4nu7GWJ6hBKNwgAVKuiioZgMkzmfLcvGftFwZO2hshYM+F9WLlRMq+UtVpggn5/GW4dEu0bJ07kmU/igQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 121ac950-f7a2-4e95-404a-08dde9ec534c 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:37.7567 (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: E7FIh2oxBZ9sGwIuKVnTg/463xFftvSbUx7RtZkNjno8pQw/WPU6aTojY+L6oR37zLmt5Ks51Xr7RoCPwy9Dng== 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/17924 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 9baefb3e6..15b9c3740 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -139,7 +139,6 @@ class GitSM(Git): # Workaround for issues with SRCPV/SRCREV_FORMAT errors # error refer to 'multiple' repositories. Only the repository # in the original SRC_URI actually matters... - ld.setVar('SRCPV', d.getVar('SRCPV')) ld.setVar('SRCREV_FORMAT', module) function(ud, url, module, paths[module], workdir, ld) From patchwork Tue Sep 2 06:45:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69392 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 026B8CA100D 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:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=MF6/5EUm; 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=IhXiHpW3ME9cvrLFnD8QIec7B9ABfa1ljIet60pakT3aUREtc4WIoEsPjmBh+776xabwRCTXef1LffwaS/VkgyN1r8r9JczJUhKDwCddOvO3yC5KuzZmnLAZCP3NF5YqW+DAnO4rqt70Ih9mLyPszGWmYfQmU9Z6V/iG0Bo4eBZMwf9Guschd9V7Vl6bA7kdu3Dq1iDpoL08dOsCqbqix9Q9fHQD0S2UmkeJyvxb7t0FaUIWoEhrgcrq6cPiU002iNKVv74/rExeCqe0TYkgZEtDZIJBjBaQBt963v8e+RcMxNlskfruUY7QQGFRlo/bmflzQrfqSVbHVfaVvyZtmw== 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=D1AkRJOCsf5CvL6iulhr0a7lsE6ljW6DefLvM7o2zvs=; b=P+UcGVGaYoIpYBXKTOc/UWWOf/NgGJ7N14M+jvvjXoXRdxTTcRmiCQ/CHDIDVqLny1DAA5JfyapnAQuw5TxvJbsidqGuS1ZzxTBQNe6d4IDGDh1PDV20lpu6/N6JhasVJqmuyv9efcb/lUnwNT3HgEpuibM+k3N5/jc4qz4C9qGHhGcIrAJIBKEW+wAlDACsuE0kLtxTCwl3xWzJKjvQxxfrdrQLJiKfuL7HISBpY/H8lt+oqjaNhrInKZHn1ntjCdAhAOR3nuafbE1fo0XS5l8dak40UEaV21mPnBrmw0xHWjRaaJTS4sF5jPLjkgvXvAMZepeUtv4NHO+vD4HsEA== 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=D1AkRJOCsf5CvL6iulhr0a7lsE6ljW6DefLvM7o2zvs=; b=MF6/5EUmsxZ0MjjiV04wSu/ISrRa8QBBreTwOINjWpWKWqIccCqVfAeRkTpzLjg48trWcKdupXO5u5pSgUDZQKHcxM0DQfXtDpM0nU7JFOWg2OWkEoRCH7ZhcN7KPaEq2u+O9glUoC4AyuvWsXzaTbe9XfqX5zR3MFQE1DGiZTDaCqf0IqE3vRq0xiZVuT0JcRHztEHjP/AqiFWK7CzVkKZA121vZJR2TTzUpOf19sgSK8Hd6Zp+SjwM6hyaV88Bs+AZtKRacxYOrfYgCIaNqny/jyCUo3Ykmqa1jqVpZhe3gM4krEC/jTTwi3HYFfBwTPT3Eu6fmpfR0FqVqCO7zA== 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:39 +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:39 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 06/15] fetch2: gitsm: remove needless SRCREV_FORMAT override Date: Tue, 2 Sep 2025 08:45:05 +0200 Message-ID: <20250902064515.30879-7-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: f5de5051-943c-4775-c67d-08dde9ec5395 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: 2cvidWKdAQ+PhRG0GkL4VXO2hmI6kHEdO8Q2dURYy0OwZB6G6ByXxN0cHUpNY+CRkxjMkMilLW2gZWJkGNAP28TppX/eiATB7zDkByeQyUYk0MHq42J4siRg80DTPugxp+D0+zZ0tsuiqQgjiJcP5j9ATLYKLBCK37Kje2yp8t0nUouYAo/pLk+gnbivESEnqPcE1GWxXDSPRaxj/poyxRVBoc+9esuwrNtaQHoJDRQk3mMqY50yz5Y+8kJo1O3VfVEDG0BsgDqayEgDUisEZFyXDQfE/dIunDvYVxpIdf2qJhYyVdlCsGE5rok2jtknOnSybf74qXnVZWI0W4XGEf2CZfO+SvF7Bpbnvvvwa3z1oSpWavKj6hO371m0AU0sD79lc8bVJzf3Ut3VaH80sHNLr9M2k2FYM++rsG5NGeomHJycLD3zcqbCfVCbJ+6cUxTbX2qdoYJEesDpBfsyu5eDDiWSJEJhxqiWRbx9AZ2aJJZOlmQXsuX6HAdQgZL8Z91XIWPbhRAiCyKPKfV0d5ktDvBkB8PTv6uebZepNguMkKUfhbZE0JS+kz1bT3QA1favvb6Yz5iIp6ZnfLwSRXlEyaOKQGBbDAiJOMnJb3G5tZ6XbOifk6v2DxtGcSCdvab+MJ5Wy3fX6qt8fkTYKRSa8TbiSVH+Fvn0PD9y0BnknczE2lKRgGR0ou8qrFS9TADXxdoLgKFXy5e0mStCrdVnc9V6GDpwm4JnSkEuUtz5qRqdi0PmxzRi0Fm928S9xAziJ0X4jukLCvbdec06C+OE0eU3J49SxWMmBfFarpEYk+WQb5l9UsiL7SLy/lFZ1OCgplauHSfpou7JImsRXeRcBRCJmKGQxViPl4+/y/3nZi4ti6ue7ybfuX8xfep6XsCBr7IcIUJsywoSty+ovQ7juQS6XxapBmjdOk/q+v6ybjGxn8s9IFBikBPs/BPDqbFRudLcnn77KZgdnA/fPB5XLAOFyi6EYhhg63aSDkXJM7WEO9C5Me1lOr7v04OjJswalbdmx/+L4CKH3eUIsFL7Ve5wRt6qmUtZb06HvTs/H/TwGdP0E/aHUiADKNmcqVcsxvcJPr1taOVwHENAhVa+dOvCYgrIpp+2+PHLTkkhEm2kN3pK5i43TL6zN77B8jResFjYx6URQaMPDGrzdFrH9uzw+Mu+6rJxizBw3vpTdfLEHbtrW4Y1Qxb10vWVyk3wWfNQDFMI0xPlexPCvt809nVaj98ARhn1w56aLLVo3baAYz/yKyrdZjXGeveV06OlMLBmlqIES7PkJdS8oW6LKSAKOJMHHV63QnW01It+eHoYEAadT6WoeHHjji0eL9tUCtZz3Zk7t2vVf6+TSBRlGZLrYtWV1s/2LLZafngo8urkurau9OdLX6N7o7Gq/rfHPW9N6gznUC64FVHw6ZAnF12Iv/ccdmS+KEYZPjv/qh62Fh5PtffEI/xEVfshsrB3qRJvjhn0kuNp4mNk5A== 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: 5q0WrIpiJXJI72BTC1CDZ9UPWbNl+XR4e7qwgWcVz80ptvsAQi3+EbGoi3qNNx8STSFkCwqiCuqjzaGq3dgB3TKmQ1zeOIyIWZRDL7qaNzYR9letU/grwVKXp3m6Uv2XIUILXlQVcNizzuCUnzP0lMpeMjPdea10VcwOmzXGtafyJ8a23SYzUvMghAV7y7Foag17en4+Llfnh0kNlyOSo0wugKc9MUHRtK7mmCEU2rtleAXVkvt4JkI85ENSKV+TmB7uA+XDyLx01whCz82NW6V4fQq5sqfZrq/swaEjIy3bNLjbV+63aga/ftNkNo1REu8olQ5RRTgGjIbgAmCONSM1aQidQ61irHiWUnCfhhXUVyv+n86wsMG+6ZyakWJ7J+rJXgNSwHse74J8f46akLJiaALRuO7gRgCwbUtonYZ96fsRlxH4isIUSwExBafZ7bb40K3WNPIUv6X4kNeZ+awnyV3a/GS6SndiD4kV23SAG1S5pC5Y4FZP62WGQ5Ds75k2d7rKP7awYJzdzi2+zNPVy1wfRHoF84UAcWn3aaJDX9XKJakxP0pTXeCdB1AWfe4OfMDUqBpZxxYrEVUowbntL+ZDeH/2gZ6/jOXyETV0o6KV9xaIKFEHOeQ7a5Vwa14gvJZnJGOuUZi5tSxf5vyN2uMxGcY5vJDFwAQcNv+pXr5iBKb3itNSkyME1IONtXYD0zyOW8IkkBIHxATG3n+3Hn5ijGi+IW9aFYPPEj9+J4vy6gITpynrlLtXAAv8s546+Bou+5cbj7EErjX9qCs7yEj6YgTf6449rNavbqrKNoyTT0RCCiYmLG1YMdhfLA+7c7pSwawAq3XznheuYwyRkgfOEcv1um2r0x1sCn6ZmVeluWuFHy/iezq+P/iM8XTr7RwyZtpiU6qDx8SQGMknLCie0ZCC74pQYjvJv0LT5vR1ZUjQ2oS+oChbNWF+mzYgTpA8vVym892MVqRnjd911moOHRElH85fkNBjCQY3m0IYduZ/kFBVnO6pekXMbZ6O5ZT8+WIAvbLYSvQtYDFBdo9WBM24Fx7WsnYg8wvSwZ0LjP0Ky63Gncnt+8+K3leVXIATr/zXC9UgwJOhGyh4KDMtCuYP+ru5RAMa1RfWr9kwmPPoFv9cdt5dTqlMkcth62ZGb7wWG1hAv/ngLXZRVW9LqY6iesdhwS8/hfeITAXzk7vstwk3NzTAZpthLny2vQwlWzTCQmAM/aEvQ4b056OvLFlNLrjjsr4AZNaj7gIWJAghQ5eEGO/BvJfERGr0nocblTB9WkPimYmai+ptr8uo6HWfKwgL4MfCrfkoYcpKoUrXdRI0Bx1mFCHOBWDPZiMPuGl9clEAH1vKymTFxE/KmnB5rRU2ArmMZ8qWOsVcqYBkCgyrNLKU+lEFDI3ebdGA6PF/BFkzKQ7hLp0l8OMWTo1AXj7kpNRZYdoZfn0smpvO/jZDUwYmhnMe142vjBEcPL7iB/8Y+LYKRsBaWeAD3Y+FK35I4NiGulwy50H7wuSftmmQ0GnACCS7t6LxU8Qe8JGEfN+tx5CKQl67LmQXRrbHFKz3teoHZ24l9p5kLoc7qjuhsIPGNyv5CYRaKOusmhB3WHUcbOCxcg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5de5051-943c-4775-c67d-08dde9ec5395 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:38.2825 (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: wnVr0Lzzk/dL9p7hCgG310r6VyKxrF+Qd2KliWIKwWAp43JrLT3c4GjYvJeNYoU+FCRg/t+aPUnTOom7HfahEQ== 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/17925 From: Stefan Herbrechtsmeier Remove the SRCREV_FORMAT because it is only used together with the SRC_URI and not implicit URLs. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 15b9c3740..bda9864ee 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -136,11 +136,6 @@ class GitSM(Git): #ld.setVar('SRC_URI', url) ld.setVar('SRCREV_%s' % module, subrevision[module]) - # Workaround for issues with SRCPV/SRCREV_FORMAT errors - # error refer to 'multiple' repositories. Only the repository - # in the original SRC_URI actually matters... - ld.setVar('SRCREV_FORMAT', module) - function(ud, url, module, paths[module], workdir, ld) return submodules != [] From patchwork Tue Sep 2 06:45:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69398 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 2EF70CA1012 for ; Tue, 2 Sep 2025 06:45:56 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.127]) by mx.groups.io with SMTP id smtpd.web10.71239.1756795548727092388 for ; Mon, 01 Sep 2025 23:45:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=Aac844yf; spf=pass (domain: weidmueller.com, ip: 52.101.70.127, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RtBUHbajM6V60X4TTRu75kB1ACrnhdTD2JsSCtKBpXt64nVDWERj+CiiQ2DO8K9IZOCe07FSE/CqR59dAff0Bw+vvhSf2xLo+4ScgLeMLo1a3+29yWIZdMdPxMZE4wIImfcczLjkyVxHJ2hL4pgyoex7gRFQnh8406w4gTBU9fJd6FiYUQAEuxZKFKSDDG78DOD0ri596lAbH7kT8FJg2/nui5a8eyhzdfOfIxV2+WktqZo6XhV4MCRqq0vjHeTzB0pOisF4+yOUNvhLv/NP3tAL9P05DUxdi9ucOp9+DZJ6ZtBjwtObX6jikaZMJGp6LaXsQFwtLGeGbLEuKzcgcQ== 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=EzxFC7hTjDeOMK8MkfGMYhPFDQspg3ksvCXyUazqS1s=; b=L13wqGT2k9e2iuw/7yQ7hBSDgbY9CmJJoJFVeiGVRVxRpry9apT9RAZS4Wcw3xtN1PV2+vzdMJxd5Tece8UkvXSjt2fNZQ2hd1qGi+vyezccOkij7OA1X3CiInClDRBYRPd36yeH0wPm8VE2wv4O1oRhji7GoAFDKulinannVgCvuexoBoGpPNsXITlknBbanAQeeBTzBARWSUfXZdtScpDi72AaUGiqMXs172PqlCWsk6UxH/yQZHQ+naUlueGQrI+hzcrp4p4Al7sTa2zC3vDW/5UhTmGPaFDpRa5znCRTEvIrEINOmnvLUlbCE29jWNkQSg/r8hd9W4Vh9LGFzw== 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=EzxFC7hTjDeOMK8MkfGMYhPFDQspg3ksvCXyUazqS1s=; b=Aac844yfn7huxHGlfi2xT1CvNPHS4geIDRGXafpPjL1RhBrkF60cBuTfW4lRVxjp61f1QvZ8PPfb194j0rGrdp8JUZSadyC6C13I3Z4rrWNVNZwZllzVNVfcunT9+8mZlGXhjQosPh4iOZNB5McG0Zr6ywIEyL+EZ85EcJXXH8wXaaV8cnTEtETrMvh+Ap27orJ7bwZ0YnH/IoFO7ti4WSW2PAHKprhmA5OTktItErPvqBMSTyk+n4Iub0cUDiXOh1ws/yjcpMPmxtghVt5RL5I+2CQ5Hsz327NTwHRGiLtpn0YY1fgpK6Jy3oAXUax+dgzUZKN+Xgd74/akgS9wsQ== 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:40 +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:40 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 07/15] fetch2: gitsm: use rev URL parameter instead of SRCREV variable Date: Tue, 2 Sep 2025 08:45:06 +0200 Message-ID: <20250902064515.30879-8-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: badd5add-2334-4ba0-1ba8-08dde9ec53e5 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: ze2hR0I+3S1HLqMrV1U3kZtaVX9J1EGmjMoAz/cHsuZTvtXR7pm8Q12W1CbQQPTImkzVE5VR/2aSfYYzR/9gORdLKVNsFZyLbBFty32zc2p7N1M496v2LZM08PG7g6zcQHkdFGzOXSmLDq8e6mS/6daJvlP28b8Q5/DKyvbtZRD8QeOrUffwB79heoVb5W/ws9wKv8y/z8iV/Ew1JUAbPfKeaCmgaLBYVg1pEw1mlOCLnvVZeCnGpV1i+UGUu5Puv1ic3ovnFra7VGUTGpd953zX3DjSD04UV/3yhEQjrhCR6vXejNT8vRYgtJUmx5pVtL/zVIa2Zm9EPDJXwc9dnhyTkciqTFR7m9DZDG/Qaesd040oGdvxi8V9rDm+0UVIdM907P4NvnL2HxtZVsyS7x81TZGww1fPiuUA/OIOJHV9crYoqX8zO1cQcUDQDQ/06a4IdjJdoaNg9vsvO157lhc69PcroCkqWQAF5VbW+x+X0GMPGb5qwBgeHu6iIbg2+Jq2X1WDvCPaMCWw6R9XYIKqRNBGa4zBg2Ul8K6hW1slwe53XolDYGVT412EP0TqFxSsDen5U+iI9swKQtiviyGEyms26uCgD7zj2sFQZrcnst3Q+Y0KG8t5ax/JO1p1/plG2vwWSq64WU4P3Uj1DGZxIZUPgYjT3vCRY1XnKAAqv6lGJ38RET9/StypL9EAhzehI3PYhIOM2nuPcc7tDUfbqsHau5zMWmy14awSL1wj659lF7raKh0sSMZOVP7N76Oi+4RLucY6LHBSHFQOLWaHrWWJtfAeup0p5y6H449f1OqCgPfwvpdsN8+Dw7YbOcK/D13OR4TOW6eR0FLBG85mdYP/KlCU10t4H97b1sRBJEELhgAMzKULQFUAACGzeLwkTpsDGP0fR8ls0meArY+PTEKpUrEBEa970zNp9/tApeed7YPKyJWxm2gOks2kw6qMVrtwt0CNY83sAynUMM9rnUiqkpl2kTTR1MhU2cBAv8q1cHmlQs488/jzPgZWcZE6JozlhenZOq52MfT4g0r8HWutY53LsMhL9MLyK3O0LwG04Nw2afW/v7vzndPLn2n7uTw0gl7lD7dT0cLtnw1Bragec4+2CJdwIAsZOj8nBoAimQq3N+c3sYK062cFrKqKBU4TB0LbZEZ22zE8r1zK21XxC0WcYuKMsxeaVCJ9eJm5Yp1nngRfnzwWUFRzhwu4x0/QaW1bElzjiicHMcjFMzETFvUpZtfSZgmhqzOGrhp2H5bYUFBQyTFKafS5QRNWrfmRrn5b7GoYF6yG6Y4F44OwtDiRUI1ecPX6WAbwa06nBgkK2mkYI0N/88zyURimTzqiDvWIPjvHKUk8AyMmuMClVj6fBuC0ImxMvqTASacqW/IkDvWgryg9mXLUMbHx8ZQD8f0MjTAOVoEbpTVuLfeUyHOiqf6zl8BfFxkZLsHrzcuAvr3CXcWv5i93fNdPnYr1wdEl+t4IySFa9A== 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: dwfUpGZ5gegN6bGdcybjrB1pC2GQWAKrk98rFOPaP6uKbU8KlaYdfUV2KOosuDE4LZeZirRGJkPUrmq4pnfVwlfaDpsPQLOa3bSWgRdVW8TvOKw8LpyhiKIqY0WMGM0XRZR5ByH9xJsX1yNkeNEX34+bZKKixZnDWmvLkRe4LsHK3M6kKWKvoZjJpuDQyXx644VnW0IuBsCaYG1Rec/98wEo1vSVzlgJ/yQKnB9kIPW1pizj2JbtBDYqffxTenLZnfOXpHo3JI3CZq0ZnefAea/tGyTmkwfi7fQ+7aFnlgoZC9pxPz8lZ8hYBC/zIgIZ0uY+iF1FMH+91mLFi8Pgp4ukCbkfu7qcmIKFlKa5QlSkuf/tvBGdy7mvPPSOmbau4n1v5Kyk0PKcZvbALYdxCle2RsxvmYm3wFPJeDSqNlU2u+sFhNWmAYDsIbI6iIW05g1Kxn3kFFU6Q94PPVPKDlHe9Cp8VB3NMF7afrGjjthSksK0BEEJN8fstp2KoAhuZ7a15X65UyWTwlHXm9DQ0Y7Z2qD0d1NOVyDg/PooxoH4mMWtqJRa2F0MR6w0yIk8fYiAppm3j8XYcBb052q83zeILvwO73bJz6O/6HLq/9Ak+ws3ysDeJM3cBP8331GhMUlIDbfVL5SofpoNFMHSSOI2dTlSjYyKbx06xBcW/N5ZIvZPBjb79WAckMIWhIzfktTFdDNvzwyB+0h+wzyfG0Hm3Hl6U127xxx1MNgT0n/rlakezRVBaj6qteRRu6Hrv7UC9Cyfasw1lH1YWjtK30BNw5sZlpkFLReA2keUiiPTfhjzkaDI9UxfWUKInOiu+DtjXFQC+85IOnVdGJo0M1wJobWpcCNYv47bgf8RuOlTt56rnQzHQ9iNsUX6CImL7KUEQdtY03jb0uBlsMNj/14FPCLemrZi5g5R5N0hurcj+USQoR8qxAFrbeUcpznszqbT017IfbXAahoQKOzcu/gxXo3jGUQiBAffuvnAZGN9xTCE/Oyht7eqn0h/X6pQFx7t8bnq5DjbuIaPBSL/kKK0n9Vv4irpmgeF4SVKsQC4FWvJBVnBxiVD0q5Mw5ZQ59EdQa0xo9kfjyhTYdrR6LRLF4plPZnFz601sPCtVkaZdN3nBpoeEETal1b4TZQjtxu60gws1ByjqtkxLyyKDWCNuxpLXn7kJ9G6ND6hS9QHaJzxZr6Tv8iF0utdDrUWWEshlArT3MxbTX999xO9IdvI9jzGiG75Kb7VpYzJEFXSJ21dZaPh58R46vGd1I5SAX5/zYX/YdFCRfqNGAF5hZWv6yG0ViVCACpwcBktzPO03hpPMzVt5VzrBCTunl6wcqU7yrDAq/aFcSTbHIBhojgA07KFQxArWGdlO1Bg4PPjhiXycSdvQv9plDSrH11sZbG1IMprdmkZlFcJ0EwDepEJ59Mio+14brXro6QaiPhuRQlybUTHn7sIliMkzu0a2jsvFhkerlh/0m2oWt4rsf81Acc8+k5abYgBxf14pgKMq2fYcNPcydMVdtZpvW2Kdb8NboqdtdF8KvuJmrDxt0di6SDw9wQsEUUUYo+0cgsEUi4FJkGUEyr+t6PfGnDv0cg3H05bqiP8VK3Qj+UShw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: badd5add-2334-4ba0-1ba8-08dde9ec53e5 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:38.7021 (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: tiZn2ZoQmSTIwZi21peF3ulj0JEb9whGuWuKSsq54jhkdG1+wxqAqS4+9BnTtU+HxnrIEbSIYKm5ozuxybaO2A== 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/17929 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index bda9864ee..497661bd6 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -123,6 +123,7 @@ class GitSM(Git): url += ";subpath=%s" % module url += ";nobranch=1" url += ";lfs=%s" % ("1" if self._need_lfs(ud) else "0") + url += ";rev=%s" % subrevision[module] # Note that adding "user=" here to give credentials to the # submodule is not supported. Since using SRC_URI to give git:// # URL a password is not supported, one have to use one of the @@ -130,13 +131,7 @@ class GitSM(Git): # the user (See comment in git.py). # So, we will not take patches adding "user=" support here. - ld = d.createCopy() - # Not necessary to set SRC_URI, since we're passing the URI to - # Fetch. - #ld.setVar('SRC_URI', url) - ld.setVar('SRCREV_%s' % module, subrevision[module]) - - function(ud, url, module, paths[module], workdir, ld) + function(ud, url, module, paths[module], workdir, d) return submodules != [] From patchwork Tue Sep 2 06:45:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69395 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 20D49CA1011 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:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=PJu+mMbD; 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=Ft7mqXOqf8DKdKJJWaS5zuzA1JzUVpsK0dvcLI1sRVVQi6uGN/Z++cpmzfT4JAExojVWAeC3bu2SDKN9J3PVwcmHyApVvKfmuznEdPnNEL8LpPjdv0+N7YjKmDupK3BaxbCay5Q6Th6p5ZMylhHYsC3COfENongDcvS6ECs/x/By2agdZmRkzfr7gWeHEOidHhQ11lJ2kI2aAXvnfoV5Q7LEGy+WKqmH2vHIsnNNJPTaVH5wW+JkSWxqjWM76nPxUUKkfA5cWiQJ7JWT79aW9e9YYOkNf/SyhXrp/e1fLxdkZtDm+8daCxp79VGjK0Z0vZxAeLIHPI4jTO5m3ebUxw== 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=6FyokpHNAxEnoGJN3uz8RKRnp5p+uqVKueRT7kHugHQ=; b=n2iHEq/IOLIbwqy5I7mQZOQriX4nwaogIv50Hw/dcvYVfgQsmDbBR6zJyWXuR7TkBRPPNVq8D7qN1OoKplU11hE+QehtbtTtypyuU+wMwUKo8fBQRZB5udExCW4zvrVLYEsnCkdfM9llCqsdHjwW+96ojdgE49N5j04jFjMYvCmM55h2Lg7uIlPXMqX1fJvYvC02m1bRhAZWf55y88RZxLe5lXFoeQ3M/6Me7DBAG0DphrChelbNmGRj9LLK9Ht7OVPakxt95TjwOqXjAJDmFOL0XzABZFC0WlkPMpCsOYPKYOPVJ3DSEl2tJOn6VRDJkNzUzmp4b1/uJIglzbIkcg== 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=6FyokpHNAxEnoGJN3uz8RKRnp5p+uqVKueRT7kHugHQ=; b=PJu+mMbDw0rYsHbVrNYgT4RruCMqaegl/XQOTRNzTCaV+NbliaQCneehmD8rlE61aPtNPc7TUEloGWiyGVkbkqEVxLIzNzvKXWJjNiS7AoS6uo4aM8+sC8Czp1sOCx6gTCXpS+3nbsZ0iKUPldcq8x3Lb77FtI6p3vgYP47E/WkCYPv0URNN61MM/ERH9mGLr70dTkm9mJdHrv5RGtpzDt4QC67qlct044Ok4nm5V5pKhqZESXjH7yEYEjnlargbFr5jQP+obzhBljh+SL8tEt2cMXx8v8e3NZW0tDJBWzWS83Zx8NcsgnuqHM/wpGb6CQ+0HeUv0/gUnal7MU1usw== 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:41 +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:40 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 08/15] fetch2: gitsm: remove duplicate code Date: Tue, 2 Sep 2025 08:45:07 +0200 Message-ID: <20250902064515.30879-9-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: 6df705b8-9034-46a5-a3f4-08dde9ec5425 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: NiiqudUTULoGDGsN4rczBeGiEY2UFbf3kkMqA4tbH/KGkS1aimGReybGTlxOekPuGLsf4vgBLkHeMKGtUrKHyU04faL3U2LRq01pYwiZ8yb4046Gz46eXRhyjnGRXeO+BD7m3GLwmT1q4JoOGYyKYCh6MTS0AJ57aUDFZo6qRBJFkM1OLKL5QD/qE+ZYBDnMSXgEx7Bg2NhBRlwmN6Bs9xTi8drh5KdtGw1EHqzB0eJkbY6IY7xnSfjQHzV7eNIPyoV/lvRKYmurUKN0CLtrzvuf0Tc0jNc6bJ99S0ns9LoDSbNnbxeBki0iwzraQRRnDX9KI4a+iiNJS6UtUjHpk9SswJUfS41F5hwc/P5WUP6YSeFwUWK7CJ3n/pCThLeguUP+TwZatJzP7FisBGawrYpAxV6g9Siq/DuJwsScqjVP/7GxTgC3g4sTaMsaNYe+1Q5Km/tcYBgcauYAkQglbk80ZuSxlkZBH0ZKlOFCC+83aZEQNYi7/+D7RsViuicUZZaALy0MCM7QBDy7nSV0JGeDCvJmaWiyRinXYfOF2h2Xbnb2b7TCOcaP8lFpbmsQLyUgmf1vtv0ATVCkxanemn3MeD3qyTzNaoYvIeJjgDCGJ+YL6afPvHQzXPZZYHLSA/aQHOwrcbVNx6wD/5XxQ0EmJ1zEK1Ce5uvfN4FayGrIOOwfaMUyIpg875AC9uK8pCvX3ziI5Y4dDpE8hr5cIgFp3rKEqLkyFNf3t+dnN80NyrAcVv4wSGq3UBPvSikyWs+qs/QOTjgezS3RWD5PqATxttZTXireC1OaWI2uj7Jbqxj+wRHyjGnuuua4qU4w2KAEj0Dc8/FBnATJGUWLQz4GwiPvX91INOco0xeW4itg3VKhmGquzeJa5+zTtThAzVdPCBuFnX1MocVvCtVgrJkeNeKY4eTvkKcdIwTPTerxxqDIVRcypFtFgpnNLSkUAnC378qjNdbElZTTiMe5baYxWi03QdioktraHOHoRdX3wyam6Kqmfd4e5G8Y37g8OflOW0xKwyo2yf8u1r80EPBA3Wy9cQ0xPxrm/g4bLghi0xkDXUmaVqGHw5L16dMXmcsD6paqc1GyLVE576KCsYsAIRgKjuYaGj/4HrJvGPDLnXaVUVYHBlD5Mnn2kk6T9kBEc14xVYzIq91bZRpoKHiv8Ez1oN0nTu6jEn6gGk6p4K9C8V5Au6ind/3AbxTtc41cEj4wPcL/t4I6RbhS1vVGYIuzzzNBuvXtJtKE/ntYvrzCBDs4DkwhL//P7kmZauiN9IQraC0nXrv3bGcxeSPAzH012I5VsWpMIglw164nXTtPhJ9Sa0OyRRzcqpSSwGG5iZxpKPL2uGIHt9dI+4kvMM6KRQIvehfEL4YnS0eDbnJtDsl4Uqu0nupW4RuXdb4Dd7nNO77UyoFPy8BoeivCKTzltrvfV/jfnjzf+omODqs75uE4fuwow/tqWvqQ8cD8JIBPS7KT6bDmQDV7zQ== 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: 17rTw0B07xLYdjbjJhi+GJndWZdq0zWAVmINbxErLKIz5/hWeeDoGuRH45gClyQEEDAz9ZOuUDCenbZX+OgwNZWeE8wBVoCVYBvNmhrVTBhUL4aJ9/XJou5N/qxFD6NlURpFWv6HvI/Z+p87SvcA7qyhXqx3wxh6V4+N006pkzR1Wj8HlAypKHH0hFvTctY4nZmxvFmJFwuDES5FUUe1qNw0dhWvtPQ1VPXx5XsgUlePAaz4xjckbs+nXc8jn2Pl9WU0snokzX8Pk5TlxHB8uWYm19La9osoKDrWSszR/TQDJTwN2O+Bm3CZP8gfOzcpFC7fd7HWEpBM786VyBwlp0VK9hrPfYhGTOgl0iw5wnCrjWPFzBU5IySob8qE2sjTYRxmLSEq0oGuH0UJSYwtPGKpHOKEvMzfaZfPARzoTiEI11L179PwBJkr11OfcGwlWcXLBJqSWONWZvO/yWgAHVRzKKLNUJVhFi88CYplcxtdKSrni0x+3jOqAgS0kzTLC8ScQEgIJEaL1w9Rw+r6D7XSWp/cGzuZ9ZuHiYnCsoSH6hvqOveJa6zQLXvxGy932FfSqPh0IwqwENwfwTPIeny1lGmkpQilwF+T/UO/KMNUCsbPUpvDHUwtELH2F5nGzobEGhDDegRQsdIahlrB1UmA4KSpxDLpuBpPtZMRYmIrdwocBTCFO2eerHiikjPiqBehBvjExRQzvQd9eAGSXcV7sRtu62ksU2diR5T/5C678n6jjOMflwZ4NUCs6rAMaNbnS4WBlHc2pWm54OGjkgiYCcvN95KPCUrudCwHz+AbX5qiqtQl2LAj80oWGSKk4ShZayy0zTHtyNWC36oNwK2q0iXd6n1VRtooeOSSyz+5sARAXYxESzVkN/3a90spZg09dJ84L/qvgE28rWNHlTFSW7qiA0f3ILFqwtrrXttB5oty2IxVYWfLBewel2Ep08bDu7ZbPyL8JXAlPfjwmEx5lcoSWFIJuuOpiJ+WgfwA2mkzDxi6giDpuIeydLKDtrr2bQc6I7K4CW09g2zDWGh0CMlbyRkRuvumlrDK2057tQpFw8tguqRvdU4Wkh/w3+QF/BRIf1wDwkcjm8v1QQSzHOD/E6AffYkwwleyX7RelaIBRIDVE0N8+zbS1NAK6kRaBPoJCCoaLvZPPe6SSkiV8rn+qWx+rK/UPryHEupO7XuBzvxxt3V9NlVEkFwVpcOScDCEYUS/gpXjYTeNfNAWYHG4+Mv6DdQ0XTjebQKtuv5jv3KBEfxNKg0zjN5UvHONVP5o7O/IZPlBoRSyP3fj9CXYqFz8++tsXWWY388oYZYK3tT0zpF/Jf0gIidQk9sx9L/5nzucnymrs2oSKrHFM5zcfedwfxj7wOLc6TwueGqyBB3pXypXJC0X7mC2jquVj+KUEZFCIzpGyglhBcSDIAkO0X05v4vcXhrgfTV/ydU9oOpgPP+kQ5QfKXstwrqk19XnbqoiX5WirlyAC3D9Uy1nZLRLft3LW3GsGHr3Kw5bEB14Q1R6TbVAqdOE2DNNv36h2IJjgqBHUpaJsXJwODmlAzsxDn3Xf+ZQ9gK9yJhs1ckdD4bcBFGKUqehkepBs1IyRg52Nt3wT1U5oA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6df705b8-9034-46a5-a3f4-08dde9ec5425 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:39.2005 (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: MPRAxMZlHG9272Et9UuAk9mcxDoNIoir9dYzgsncWANQpl9z700sXFpriYj3atQCV5TeEF2S1Q0J0wu07tfsgQ== 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/17926 From: Stefan Herbrechtsmeier Remove the duplicate append of the nobranch parameter from the loops and move duplicate append of the bareclone parameter from the loops to the URL creation. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 497661bd6..953a1ca39 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -124,6 +124,7 @@ class GitSM(Git): url += ";nobranch=1" url += ";lfs=%s" % ("1" if self._need_lfs(ud) else "0") url += ";rev=%s" % subrevision[module] + url += ";bareclone=1" # Note that adding "user=" here to give credentials to the # submodule is not supported. Since using SRC_URI to give git:// # URL a password is not supported, one have to use one of the @@ -157,8 +158,6 @@ class GitSM(Git): need_update_list = [] def need_update_submodule(ud, url, module, modpath, workdir, d): - url += ";bareclone=1;nobranch=1" - try: newfetch = Fetch([url], d, cache=False) new_ud = newfetch.ud[url] @@ -178,8 +177,6 @@ class GitSM(Git): def download(self, ud, d): def download_submodule(ud, url, module, modpath, workdir, d): - url += ";bareclone=1;nobranch=1" - # Is the following still needed? #url += ";nocheckout=1" @@ -197,8 +194,6 @@ class GitSM(Git): subdestdir = self.destdir(ud, destdir, d) def unpack_submodules(ud, url, module, modpath, workdir, d): - url += ";bareclone=1;nobranch=1" - # Figure out where we clone over the bare submodules... if ud.bareclone: repo_conf = '' @@ -239,7 +234,6 @@ class GitSM(Git): runfetchcmd("%s%s submodule update --recursive --no-fetch" % (cmdprefix, ud.basecmd), d, quiet=True, workdir=subdestdir) def clean(self, ud, d): def clean_submodule(ud, url, module, modpath, workdir, d): - url += ";bareclone=1;nobranch=1" try: newfetch = Fetch([url], d, cache=False) newfetch.clean() @@ -256,7 +250,6 @@ class GitSM(Git): urldata = [] def add_submodule(ud, url, module, modpath, workdir, d): - url += ";bareclone=1;nobranch=1" newfetch = Fetch([url], d, cache=False) urldata.extend(newfetch.expanded_urldata()) From patchwork Tue Sep 2 06:45:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69397 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 2274ACA1010 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:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=euNSxvpk; 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=ez0LmgP7hnyKRb+ISHZkOHEWN9UDQNKeWc/OruFltaLEcxR4Ys4OdDguMoUyntRzYK9/8qW8t+FMUmx53pntQa8eXBHmMK+RQtunQrXENEp2A+OCgQ+DUVPZMmLgSpmqgO9ccpMMIi9E/t/LwwnC1bOA6R2mtnJqIE+YwLCuvR+Dc6L2vtD1IU+6qzoVnjwgMBozX1msZLepSOV2C29F64tXLw661bqPjLJJW7W/TUiTmA8jMySqIycwmrwZjtP5cMsD7W3KAwUUVsFxSGuY3+6eWdvIjqgaaNFbOumGzJvBXENpzFEIrEfHXp2Q1hqPIF/DGEK52dW38avwJIMfDA== 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=vFRoA7JRy7OshtUdplLpdrbr9Tx6NIq1eHXePa49Zl8=; b=wORWqin5WbzOK5rys7XX2oHX5IrEFuJEYusLKJcAdEs2Tea+OTEOPAMnFqCWEIf6JCAKj91XrLQkS0BJGttTTPJ51SmU4K6SZkReoumRrERDWGCgLXn8EllgkrUVPm/33mdPxX69LkhoXggif5/AwRpib871NwkylD9bh4wplz++yh6pMwDMB6ooaPe+z0ml1yyzKBrOhDu8PJ8S6hPU/n6XwTqj7bVV5+GQEEjXFPP4r49dxIFVL0j1mOYopCT+p8fq+3ADNCxi/Kl5Dhn7rIkBoDrfaM2Tmg9XBU3nLA03bgHzslGoLodXPeMLQ6j3/qMjnlACPkcfrn3NbeBxFw== 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=vFRoA7JRy7OshtUdplLpdrbr9Tx6NIq1eHXePa49Zl8=; b=euNSxvpkxcMVHjO7lE6EmEohb4v0HcaPiovRLtnAXXDkb2yX8We/2gI57YJKT3RiZU5apmrCOrCESzBA4xAbIlNpO6UR+1aa6YWNO5zdeCdVeKSTGtQOjpdyfR7u9XhKbI7n6bFfc6kW+FHlcHpw/iRVuVg+O8WUbd1q1ZTg5rUVsOaxPlXuQ7EVoPdjydVnDb0Eu1Z62Rv+Zct3Pk+FSMPDdeHPX+ocL+2zLBMcSXLX1IYbpum/9xPVSSCXgvseJhR/S4JIR2WY3fZ3iTBFH8Dvpn/R942fYWiNzKReOWxqhShAlC1O2B5MtLxqUDaDBdTPHd/0FN4ACbtI0jQ+qg== 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:43 +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:41 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 09/15] fetch2: gitsm: use subdir parameter for submodule Date: Tue, 2 Sep 2025 08:45:08 +0200 Message-ID: <20250902064515.30879-10-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: 3fd53c2c-ef5e-4873-fec2-08dde9ec5478 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: hJQHeYJt0oeQxjHMyNMvTUZWKMQ0Ec/Ln0MVBcnVadsSV/KLkYMqX97ay71yTxrgmVoRe3GTH525CGElGVxGWurPKP/oAw6SL2gfhP/v0mX+AE8fu4jEbDC26eDrnCJmeQXBG5uCFYzEOrvP33ic4L5NJPSZixrfAg6NKapNqF8lxYgndErfcPL0+nrqllHG4ngWryIX5Zq19FrVKtv2ZYsqMxoIJGcl/ELrxLx+iPJVPO7p7hJE3hZdtRQ53FXG83u8swKO2cr/OIVn2IL6tOXTF/5itgm2mfa4gRCAa9nat2E4gs12M0OWiHUw8p2xkqrlLBY7f/eDA+D7vDZpvt2wBVZi9eJCPgtzo/KDmDuZywRdqX4VBOZMKuhGbXMTcyx8eXsiluPV8Wkf1OVk9836KLtTQzmpO/POYNYGKTE+8OL8Zh8sT4zb3NY3W0xaoQeCviRmO5UbJ8PnnaSgeMtJP1fsLiGJfHAnnpxUr31fqU9FKwuX819zwz4gPYSzFa2pLPs2gB5grL4lv6Nbhp94WxfvyJdOwOYmRuQnWbbH/RaB7ck49sQpJdOS3XsElYBjWtAKSGEwhXK6mGluzZqQyvUbIrRDzrJw7C3vLSGlfgAkk6gg6UORvpaqLxYlFFYknZ9Mz6bhNkGhyV6w+8t/lko+DPZxid9RvkA4V1YpJlZwO651FLsyOxmd+x+buqh1eQRH0RKSZhtHiaVyGJ+O4jrCYJlRxQL5kEgouX2kvM7zTGtBQ7wMisuc4T29RRSQa0tSbY1kavhzL/t9yJ/e03dY3p2rEXvWiLBvpioNCFJUL6hlljHVJawbN0u3TEjrTpENz6X6zk7u6E7c+4y6BPUlciKbzjIGvqmd2mOd3ipcdRv2WRW1pD3ThvcrvLsyVbLrbkKkrBnaeVsGQ6OCBSYqsZhasC9tiyyJk/lT32JL8FOZ21EKmtfOLoRKY9MZpFgDEVc+g0qZNisAC942ARuCuLAAG+mmb5sECTyEg4rgLSlvX9Nd8VFOebmPtexQgWNE7HGF6xID+8ybWCkIKg5nrz3GomplSddscVKvjJJQu5lKllG1KMboyFsbdywIPaj2eKLsORmYFUeb68+7uTkqtZvdxe1kqIHdAMRhqf/MMI8nyNdpYd5zicX2/Jl4Oqho9OxKfLX35upo7H3eBOJeh+iFVni1dfbHb+hHKUeKG6IfHTyDruLfWKtehEdhs3Gu8aDoPLzNa6dpiHLIa3Ik+8KJOkNNp41yZZFQzTInDRf4JMXdl1U2Q1Gv4LG3ZVHbB0psV1cGw+rnYPqTD9rtLNgMyInj2VO9CsIgOOfhG3+o8gLk520lnsIFpvJt0hwlklc7Yl0W6HoV30d/YI6PVFGpQd17S+KV7YCmEfQZiuuy8dmXx3Zjj17F36tG6z+4BrPv4H/eI9Y0P604nqJlVMsAgMAJqNQm6ah/ZU72QOd6vjtw/NCpudZYjX/me9uJ4YhDSNosnbFlpg== 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: 317rIKShk9zfwADNrEYILBjlyBIva48MnAKY7nb8oq4JUGUB4BwK9TDzs5lyh8GHHPi2EDLq7z6jzordVgdNcSmiDJKjPl1PvI2sevRpsuYuHz9KuWXbPD1exgnwXZtbZMNlHSeWnFkoxy0VnV6hqQHapzu4Hhl/mtqTBeBAKoCslasIsalePVJGHwzX5RpEtQ7nygIgArTQFEn7OlVf0onCJlc/dIMhVoFVPeFOpEV/zVh45jtp7snIhnmUhMQ7ANZGCoyrF4CUZrDZ5IW9cCbmn3kiwXPckj6c3azZvWSrIQ+WdHjq9sFWoenWFzKAILEz/nOCmTVytSMhcdiuVI33bUJGEnR5+46ZZfZ9fi9enx9iOIqmiEE1GxjRDXlG4Y4TMeGQ4uHE9bR12+2udLzJA7a1saomUuwfk54Gfdb001tH4p4pyLyHZCE78NLlGXZxYrwjQ1teq34VsI7QtSf1b+akbsfSaqufDpF8q6DI00JibmZHGmXrdb25OgbovYtqTrblWK0Q7UwCa0rhWNXenae0+iY+v+RxfbrUXnJiwPiIQXv+dyv6z+Jjy6lCcO6JpDQa93UaTSQhZw1ZCoj6xHK0BEYguTnruVl96LDrKDkeJZ7zAPYZtKPYTVWCPws6opNO/aaZbCQTZizwQ07LTzqkuOiZkJyvl3gsh2BLB84pPpoKXpgNZYjCguu+Q0fyMn/U+EP+ifvlYxnMFn4t4QF1EqD8NyaoTk2K0viyyp0Qth8RE5O5m1dDn73Zap9oMo15QFLWMmONNSDztws8qWyelf9K8unnMK8lOHjCeuEC8jPXoS6C5ITsa4xS0Ps1dbuTbXANTwN7t9RPuJ8pxNllr6FND6wq9Ae7qrg7VrcmKX/SntcDOl60PfCDv8rMbuysLJEm8Z2VwHzrgOMJSm5o6O5A1uCddsV84Km2hnl1NY8QtIVhVwi8i9stB9ZD1IX4wFhS6HruEqoy/cUAXv5/ACR0gjv3arRtykS1QtCR6x2CHEBoGx28r/R0vHrM5o+NMavV/86fXw3j86hjM7qmt1Bae1bbCYxMN5Od7LeGUPUr77jxY6TR8b17wIpCfK0sj0xG06VQMJjllYQbrPo2A1Xu2a9E/2oxDPRRh8OweFAqfvKDV1lXS94eio9/AqotZoRPaE3YoQr+0UvHjFu0BRRYtbjfzYdcBNzGsx67OqwYtYhzwUs7h/g4VgBuaQHV9ey3hvCRzs9QlUNyqf8Uq7S6GV1NLgFKwhQGhGa91FifGuU/OHgGgp/lGvzirLEXtH6h4PguN40uRdyLCOdzK/KQgTYVUimCgT7bTvuuhUDD5GUkFYLo/cZrM+qiI7/pHVuORPXxtt1A4xAyEdP6nAITODXyn6uWOCcuCh/LJ1vNS4sMZTXCMKIbgl9nllkiSzjrFFTFg13Eu2gygs8XgmTMvIApW3AmAH8rLi3dvTEVtaAHttOGdyY/uL303Anv6ulEWrYKzZTLKZ4wMnBL8wP1w7o8c3NGfAphC6LHu9j8mLtFulFbviZA0B88vDwQPSa7UZYQulo7deMVxsN+kAhe/+JHl91zH9pGcuP7/8dah9yC7nyPF1TMpcMtDB86uPOT5JTItSC5gw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3fd53c2c-ef5e-4873-fec2-08dde9ec5478 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:39.8215 (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: HrS80dw4hgHo0L6ZjfNAReE0xU22nEYw2h8jaI9eDeVj2rCSO8SOa5ywYoe/v0KZu4z0V4/kGN4V89sBcV54uA== 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/17927 From: Stefan Herbrechtsmeier Use the subdir parameter to pass the destination directory to the unpack function. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 953a1ca39..d013a09d6 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -125,6 +125,12 @@ class GitSM(Git): url += ";lfs=%s" % ("1" if self._need_lfs(ud) else "0") url += ";rev=%s" % subrevision[module] url += ";bareclone=1" + + parentdir = self.destdir(ud, '', d) + gitdir = '' if ud.bareclone else '.git' + subdir = os.path.join(parentdir, gitdir, 'modules', module) + url += ";subdir=%s" % subdir + # Note that adding "user=" here to give credentials to the # submodule is not supported. Since using SRC_URI to give git:// # URL a password is not supported, one have to use one of the @@ -194,15 +200,11 @@ class GitSM(Git): subdestdir = self.destdir(ud, destdir, d) def unpack_submodules(ud, url, module, modpath, workdir, d): - # Figure out where we clone over the bare submodules... - if ud.bareclone: - repo_conf = '' - else: - repo_conf = '.git' - try: newfetch = Fetch([url], d, cache=False) - newfetch.unpack(root=os.path.dirname(os.path.join(subdestdir, repo_conf, 'modules', module))) + new_ud = newfetch.ud[url] + fulldestdir = self.destdir(new_ud, destdir, d) + newfetch.unpack(root=destdir) except Exception as e: logger.error('gitsm: submodule unpack failed: %s %s' % (type(e).__name__, str(e))) raise @@ -217,9 +219,9 @@ class GitSM(Git): # Ensure the submodule repository is NOT set to bare, since we're checking it out... try: - runfetchcmd("%s config core.bare false" % (ud.basecmd), d, quiet=True, workdir=os.path.join(subdestdir, repo_conf, 'modules', module)) + runfetchcmd("%s config core.bare false" % (ud.basecmd), d, quiet=True, workdir=fulldestdir) except: - logger.error("Unable to set git config core.bare to false for %s" % os.path.join(subdestdir, repo_conf, 'modules', module)) + logger.error("Unable to set git config core.bare to false for %s" % fulldestdir) raise Git.unpack(self, ud, destdir, d) From patchwork Tue Sep 2 06:45:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69399 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 2FD8DCA1013 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:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=VohCsmUV; 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=Kq2Hm9Uab06yybGGp7p95b4Fz4C9dDp+byUc3RNUBiCU3fHSJ1ZwPxELs787AkQJ9yusvoxA3vvmYx4nnwqQf+ChKfKHr+X3//PG90rB2VnhduicTBW4GWF+htbfhY/snx/L+FcEjLyYMFeu3ifpF2sxuqYQlhoc0iggmltKQ6I0ghJL+F/9knRzKEbBbYq38Ekaj4ONZX+5IiM/5wYdPUg8vd7CfzvmVsJgAua3KGp4EFYXRI5ot9SGyQDoZW+XlwngWc06j8r7d65W1krTeyUdPqVmxa7p46pdEkUhY1QKey8FzSMIZbzdsyxP+oK7D+UNGVaPhu4hkSOLMum9jA== 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=DhkxBN/Slw7Hb4Vul1kLL3QpGAmLOfDhTfnGTCg6pYM=; b=VShZUiI4jMY5L77zxv4rJXrSm3Rty7RLUMbTDqsW8QzJc2+0qEyV//wSFj6WnK9Nd+ZX4OvKxrmDbLYDZ0Qn1uaSu4etodDmKHPlsfLvhTyXCYGlYADe+0EskIl9WK2I5fMfnjHXySu4MGd9Fkk2QO8VbaHUpDWrF3dqRpQ5JHoowpoxKTxrJubsj2wNbiXrnOHPM9ZJ6+SvjGuEnB62vPd+VfhhzDjeDTm5sG2YtoTF/clg72im3MwsEAg25u0vuQkxrStm+5v+mI4IuPVVrpxfVTn+y5SizmDJZH893Ww0mqgPhHxg9b7GRYYj732fxWTIXtmrHYW4eNuY3BwEkw== 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=DhkxBN/Slw7Hb4Vul1kLL3QpGAmLOfDhTfnGTCg6pYM=; b=VohCsmUVe7Iql6TjZk0L/zTjK82wTj942qDthhBbQ+Jn4JmCy4pRUtBFRsbDKJOB0e1jThVa2xN43B86fU2ddQdxH+a+Jyk0AKlUqcm97hpKXC6KPppdJ1sTvaIiYoDwIKEv3sN/Pv9/vh/KaDDkuu0Xxgub/BMkXa0e6W9wBv5oxiTsetgi5iUhqG+wQQ6hxtxch5sRhD5Jftj7qxFlGTTA4LdbyZ0Yd5PbF2hUA77ZL/CvCx3LSzkqwDSGanRPIOPYTlTPX8szQdoh0wb6bsK299fGy7hlKF4PeXGo67v4hENu7eOgknQPp3QoXh85lcXq5nw7oZBw6jkdkIdJ8Q== 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:44 +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:43 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 10/15] fetch2: gitsm: add parentdir parameter Date: Tue, 2 Sep 2025 08:45:09 +0200 Message-ID: <20250902064515.30879-11-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: 510d8c6b-e2bc-4fd8-da55-08dde9ec54e7 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: tHonDkUR0+dk3ZBp5xOm39Oq60fn1Nrv+CHewbqaVNbUNL0QZl/3t+dov58HtVMn+rKnaykD8nI6idPT9L7YGeRBRUv2R9H38g9MyBcqi5v/KA2hYnDV4W5DrdLVPnx7gJkuA6FPv9IzD/vnqr8SEXicn85lm+4ZcPZs2WKLqh6OFntsMQg02cqcxH6qNprIhR/7hU9pK3v5o/koztCEkgrOISvwaDDcllSTDGypxknu3tZx8dfIYAwXwzL1e8edITbVYApqzFsRk1V7zoeSaAc2F7/AB6TZMpE5CWafN+cFDmWS8p8VYOEQ1+IHui9uarwC+iOAdE2dS18jdWSS3+qMU8xApW4uGIkaHmeCw7ddft2IB2+TLcJ/mkEbvtYrhBvmGqcQ9r6qsBvXzz8isfbdl+wexalCXGY1CVQU/1einNGygVpPBFLOOx/sruQXdvZlapQEHBUrBYzfkox0CQPtoP3XGrG4x/MLPrJDfNUWeGvLGBx5E6kKxFntgJEKUUu0DwHtij+eBEgAE8th5ruEX0wkkdmKw+btP0jG12jkqFPbX0w3PHdWVNDfQHVQ0LJSLb4yLi7TdTXj62R4WkbXVmLM5LaXqcC9xL+6204hL3Bp5Ozeg+ZOGRIfetSJyvlGm20eEuj7SfRSt2l9gqMSkEpra9oIrNFCIY3D9EgDlwpYYBWGsH4a9sTotPErcI1i3xemdoayQNC1nq4GfsTO2zwgh7eqx0WHXhgMJu8o8uVA+49RKAmEQJRV1FT3QLlnDMaGWY2XFhhJUICu48A79JcgIMKauSVUT8xqLnapL4J0r2zX7/1elQ034qAST6/2FYI/y4xhRtGpdJpqPgCVJAZ9gGJc2LnKIR062Cejx+M5HhqY+9qaVxrkfP/LKc49tQ3MXceGz0lNNgrdkBvycpIWk31MGbwG7UI3FVLlgpfgnFHPuGkBLbdnOiYGg3V3AnelcVGaJcWTJtco54ltqzg2DbcqEK8IwYf604wvxojWRUJNkOn2XGG19sLkMVX7ozm7CgPnKAFNe9LzDSrhZWFbzwWi0NTfNQwxda7gEKsbQbG8YOAy3hmH6bk2w41Me3HzLD1jnm1Vw0SRSL7gPzl7m8KH5WS8zeO+BCKnka6i4sbxNFOzMYqPSeEIhIAibFURsYCbYSKA2zVEnK5gXVwXn+J/9DclkSI4KVYC8sPHNNxUilUHgBmQTd5dWnbobQX4G5c6iPktBBy9kspo4VUF7GtFjhGGIFjK1RIhMvNiBiIRSst74/hpa2JLwAaiAKZL442Ie0Pn5BI63MHeZlwxYLBtuWdzwpmxutTeA8LkFbuzsiDNEm+438zFoq7GOqX6s5JClKIuBe/N5qpOVUMgnFeCbksVZVPHJpxCV1FUz2PcI9b9WywQ2c1sbXH+OS7aHQPI0yD5AIpwjFiaEMpE0cvrubi+3O9cPN5KZPvUmP0A7wIaY6XM+o8GBYhKGmOoj/0M4DM1XNsAXw== 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: x0C8lVSEvqx6rgS0QlPf9OH7v4REJdZtvNzoT1LKKTusVPUr0KfcsE22pyPJR/Nr71tMiYCA1evhKN6N1AfVekZtiGKG2c2b+MOlxanvKtvp5F8SnLkC9Efpt3bW3O4Suf4o7t8czTFOgJvU2JVQkS9lPtLF3APmMC7/Xxh3sRGCLv+X0xE6KsP+ePkQJ+FdMiPKa9FvnptOBVsOkuPSCrxZUYH3hBz4US2o4qL2exjL2R976HKlEHZrHK+LHmxo6y/gnHH4Y2p6XjXEhsgiuC5RVBjpBCFEEJ6XgAYL3UwHGx9MNcHgY0ayBq8dx918Y8fQpsRWEtJPwjkOsZj/2PqgyM3wTKUf9W+0gL1Ra8GA0AUvxebxofWvnIFR4Tpg3gZ4z67ewXh2btHE/7UdqM9fapD7azCQH2IxgIH3K3LqaqT5EYo4WwbANeQX0i5yI8sKOkHjYyAcmpXQtc0LLDuVJBpyH9NaRL14iqGbgcnt5AZ/RBxjAdbmRvMQYkLXev+elgnEsKAVjZoS4JEYWYI3s5sN5rmvUoaP2TCioaObgnL/wIeZ5lSdnt2MChUnX7gtL2Cz0Ek0dsQCgf2jT4rqsZ0tA8mP7DdGDVdUx6axI63yod/6LXvfGVc77S7L+ecpTYncnKrZWsx0KhIFGeYoHhT65MpnCXwfR87Lq1F4Hgd5+ExDuGpjnT0mAQyNWRqyhho3smQ7QxYi2/jsrGXXMfxAWkHabh6D4giXa+idV8fv9z7ZzMuqKTlSv0Ifz1JYUzQJaje8qh+htoYgXKkAf5WOMFtFPT47KtdB2hBauUpVQV+JaPXWR7GOkhnELRgu9ibGBvcNeLryHCqZmBWmNtqdwl256UDg2gQzNlAX2uh6+81gZm8WE3zYMU/ZryN6T8pyQvarVGCkQKyUwVXWZv9mClpoAsfhoYbUnMTpC3t3N2WrdX/+rlfJmnSYoL9WCBt/wBLtU3fc0hZwvUCplB/m9h0xw22poMk4ahEvfEsdRYuSgwJoo9NQFCjn4GEfj6jIY2anKnRt3BwSr7dFfCOpgbDO894/kRc3TBjkMeOdUgJIwST4i5GYwZJCrx65FNZdEKcmU2JtKrKFO6UGz0YTNm7VrccXriPtBQuPNEC9uiohCvG8zy+s74RNOlD40u1sGxjrFU3vmKE2xy0keitJixzX0PeM+73yfNazQ9JHW4UsyP8g4vFJmaf963pLJfyB9Tzl7F8hUuTBMKGBwvRpfqdEUGrg4plQBbhLA3LOnnVWo8CpG7eJGh6o4cYVKVuQuQQiDQfTMKvf/VG0mTyDxW0OG/qYXGKkSHk1TrTJPpCo8Wmk3nCTop46frHNdrOF45GMfVb1Z0zfbZwcjMHrVR2uO5ocdpEW4ADP7Q0wi8fC/NRtYQx2EvSIdN9XXps1uxYAFlaDJjkv32UKLonnWz6lKm+SliDSUxi7XuLrPsbAavV4zpZUprlo/jkkkQ5B3PWZeIz9rb7d2BpHjhmJUfoiRQcTF761rowzCOz8f64U3XgoDtEsaE36uSbFpbXsxRFNBDaMsLFRLDdQTbJTO7IotHCPMzUURHzLvEZJiuiljgpYipJg5YWJkbNEigFbZDfZiJbrs9tmdw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 510d8c6b-e2bc-4fd8-da55-08dde9ec54e7 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:40.6557 (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: m98Hnhzma0VjxpKM2vnEG3CpJFHXbcIrJm0WaWu9Olk3uGaXBT/rpAzzJjzbV2qFTZk4qBLBa8vvCrhR59wDJw== 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/17928 From: Stefan Herbrechtsmeier Add a parentdir parameter to pass the destination directory of the submodule parent to the submodule. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index d013a09d6..c3e7189a0 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -127,6 +127,7 @@ class GitSM(Git): url += ";bareclone=1" parentdir = self.destdir(ud, '', d) + url += ";parentdir=%s" % parentdir gitdir = '' if ud.bareclone else '.git' subdir = os.path.join(parentdir, gitdir, 'modules', module) url += ";subdir=%s" % subdir @@ -203,6 +204,9 @@ class GitSM(Git): try: newfetch = Fetch([url], d, cache=False) new_ud = newfetch.ud[url] + parentdir = new_ud.parm['parentdir'] + if not os.path.isabs(parentdir): + parentdir = os.path.join(destdir, parentdir) fulldestdir = self.destdir(new_ud, destdir, d) newfetch.unpack(root=destdir) except Exception as e: @@ -212,10 +216,10 @@ class GitSM(Git): local_path = newfetch.localpath(url) # Correct the submodule references to the local download version... - runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=subdestdir) + runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=parentdir) if ud.shallow: - runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=subdestdir) + runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=parentdir) # Ensure the submodule repository is NOT set to bare, since we're checking it out... try: From patchwork Tue Sep 2 06:45:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69394 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 1A976CA100B 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:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=PG5sr3Je; 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=TysAzBB8dVt67yhAGAb++nriicHzwUf0I/bb6u39k4BKEaJfceag8MD4bdgd8aTIoPoK7LPrq5smcqYpN1rWAkB5ED3EHKBvzA/r163cRGMBO8RqyzhbqTfkSR2CuD21q7+oLDpgHQ2pgbv7Djz24PfLt4dsx4TMxBeWQkp6Nn/oVk1JsLrotL2mSpeEW1IiuCytdfyvhgtNvDFwrBnuFO4g10yLDEMuVvPNKpPPNHTumQRfok8tXA/tQ7zCEg4QLqBXL/sGU+Q6eG3Q2+gDb70ZDXsA4MtqKzZxj2+Y4HQ6gCG8GoWx0Zvk1nLcuo617UWcgbjD5QkZIZRx1ixwBg== 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=1IQFXh4tEGCzBV++ML3ZkOXmpjlHV6Uq0ac3+85o518=; b=q3kf2fEC++I/p1dJWYwxMeNkNL7gMPOKpmvpWyi//0xE+sketagr/lMuw6DxDvamQ/r4teCFfNAUXJmtrOW2mZandLfO6kZxB6FMbNB/lSHT0huATxIjSb7wFAFpZt3Jq01Pl86y+yRm6w5o4CrApSYiUSP+fa4ypHfgNjoxUrRuRIvwRjRr9Gt4Y9KlRM/Gj3Bn7RTzndUX+yUytApum0ENBWVAaaQlzMUaedT9A4r9KelibIB9NzbTLmVRnN0EgqN8/kigtzQCKQZbgGvDZkPagpXKoUpYtMjKCS0Q3O1cbtYO+DMj4HLGz0sB0FqbSsoIlnPV/6jODyFwktzKUw== 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=1IQFXh4tEGCzBV++ML3ZkOXmpjlHV6Uq0ac3+85o518=; b=PG5sr3JetaDRLvqtY9FESjIjRK/ewVdmIUHY2k3+kQxQQTvo3R40QkinYgtx8QY32YPUPBSpVP8X9mOJudCrmSZ5brVjnblToI7rcNWtqtdm5BIJZv1gOG79lwkHD8jniFukJos+maKtfmRXYHRrOTwYSEKHLv/PXmmNWwBet0tU/9jxLWOBPAQOG5DZhKIYbYPYwc3RvF4FaUcMD1NigWgPsO2xw9MSn5cZ0wb4HfU3Y3PDnKGog6K9cxqfB1ZBqc8tsUUEFlRSH0GXSl0ySy1cdUlRpG5rU/mXwbU93LYqHMwx7OfXKic7UQByye/cGKK2lJjng0XjVWnqCfeJRg== 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:45 +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:45 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 11/15] fetch2: gitsm: handle submodules inside submodule unpack Date: Tue, 2 Sep 2025 08:45:10 +0200 Message-ID: <20250902064515.30879-12-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: b145e9a6-5d5e-4a5a-b399-08dde9ec5553 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: JEmQTBoKO7faTV96qTPlmZXXuRRBUrZkPTuIGYJk6dNYz0gZsiwb3ODsQmHkBejo6IYMntCHOy47yb1SrODKMbxQr+6kn36+WXruuos0bh9mKnn+W+mI47GzYw7ckB0EI1gfJ8jfUZ0tB/eXxexDCWS34148GTczv+rELIXuJ1eZgJG3JTcF1eZ2gdDD1EWPHDm3CNAbzVQyuBLTHfIVCvYyahOxdN7APCL049aoH8Ymxu0nfCJP1nWV2cEZGzwKnX3fQCcYEo5cDowvhT4QOmIh9nDGMonh5yUeqvPQC9bJOCUT4uCduNiiMh9INj6OB79cxwwRQUo8BAPsLWEQ8kHM/j7PTzNAF832FNhkm8pP+r4gsoBSHSB4+uCThZPWKXHV4IE3bWqufROy5Y+zqxDWfWLsTw1kjqUUtCgn1T3D7wLQnW/T3did6QGXcQqQg4wA0NhKFsC7a/dgb+iYZwmUo/3GxvHTFbtlENHwJurjIwXoznbynTa5EDpA0RnABTa0k6BMfY81tSEK/1kcVn7csZ5JZxF07K+9NtDhGNLcZY+lsa+GM1V5zFCLaeYI32iwzwHD7JCKkjSOKtH9BeWQAQHPbzPSBo+b7l5/l0xZ2bRsnQzvilq5U3CsoukjHaIvANr1Eb4lIyVVhHD0jmydwGuf1zGwnndA6ne5iNeQ8nxZk8cUN+28aU8hdUyjrjSKhTfVicOiznit5UXLkopXZBkYJT1BHsbvBolMHaIgIYx9dGsRNzt+uQGnWfGaXKUs6Av5CpSAkGu5Ef2gG9PWGI1soGdV+csgjw5hw1y5M2LGt0XmAJepgVWPusxkM82A6i3IPcAJFhRDWHL94NmrpLw145DIuEXqCwphtSlw0GjOjUB+gqgLDkRJOowtsUg97sMhPZLrdRuqPmxzWMazkWLUesGbYo6hMKZHlWVvPKd8DZumGebTgrQJEpqz52hwuQ6CguyVHmOhY4T5LzYm8P/2saIe+jg3TOkZBx6cEU2wbPNDeGQY0UHIgh/HBKRzdLntRDIubDeUTojaDYKUPyuIpv8xM87Si+nbgzXpDAlApllLWH6xDaXXv/aQlOoes2HhDoxzxaJb+xdIWol1F19AHqiRyNgOUpW5+lJTQueXNFp7HRl2XNrYGzvyAQAD1Xbr3W8bVjW2o76kQcVZXUfE8569fIchEsnIP/IMKxLFWVFD10bpQLXCzWoQZNUVKQFCVWMZwnfBfz1OWtE4mKiWO64Mj0cjclsDI88HvebAMKL7rYGGEHwm0qc4PvPpEw8IZh2wsvTr5ve0GWRbGV5mMvjM2CeT0bVCIvrGVd3oj6P0qnXPeeh/on+RNDPP0EcvNPRROvKDiTJUZPgEOvW79T+9uczcVG191hTTR2Rvu25lkJ5KbTvzbiR+4j2xLHlasg4BdScCgriWvIOnOjEoUEY2ObwkC0JSDfMSIAbYPZIYTU2vWWzhCHk79oYSSfoJ0CAderkHgjRfJw== 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: l6Aw1GJD/MAoNBJbvPm/mCqIhckErQ4HFeiH+Xnn72CvDA7bSVzyzkfOx00yumzXduqyKxJI5pV7+PN3Pt9nnNIxIjkeWxBWftyvdzgakjlf4071UDsjSzOK2AnHytiZiOqePPNMpGUO3vJ5b6GVyqzGZ+JV/FJLkw62hbpqXxP8ioJ8aXTqOqHOJ9D1rxGUfgPKL55VVKFgtZE7gpCxWrQNJ/0PpLDE/0BYMXhVCWRuNM35tjFYEhj7HMgWfMqyvSsdiSd0OxmAy8IJP3QZOd2tSsVcxzjneWogWZgLLUaOzChh+ovg8yQj05aB5g1pKRy5UmXnJoo/OougSJZMxSkKSFYi4cN3UECwWn30F78xSnQhheaWNeS0b0sRkuG7hw7GsXahvb36GcY0ziO/5kAtEk0N21KXSFnP/HqkyeP+5RywEziN9tYw3X/Xp72oMFekIaA8dMexofzIpC6vKaz8cY84crYzrOJxEGar50FnmmxJap/DOjYcTQZTI5ApMp1JPqwTWyEDL8cjTWcGUckpUOmkZZ34aQmpxoHz2pUfgH0TZET5hamDbB4RTudYIdV6uwT0s/zV+aViGxqqxaIMsKZ6D757q9Fl2103tnqRl0A1pQQzX4VBfN4C/FGK5kHbLLWH20K4OYl7Ztcs9WqF3/++soQ4Jx07GtMj1ofxnlQparZIlueutbdkLlFJ45T7goVsshL2aTSX9fkcK3wtzXv/WHJs98QGudfYaYZfH85pD4tSw4BxFel5y+zIbkJnhwvDYgRPUw/LHa2N9gPZ8mv10lnEQobgdFfBL9YgfUksV09uStEmPOoyQ9ZNQhF40fqPbnSwo9TyoXDgB9LoHIoVAG9L8PDhI1NylO8EEHqtZDmFa0L1B9cyPy5fjNXPcIifT6K9MF2X2ji0OvU/M5hI3oYHXcAs/xEa9JwNCWeUXhI9s163fikU1XE2TZ/hZi3NKF8xzvj7Rc4v/5yIYb5JJYbe0kAn7a0HrTsLcP8FKGX1BbBael82pk7vAuOxqnvezIY3vlp1eFcOO/1Umtu6ENP9nd9/noXeg6Cso+27xmLJebt9xYS5fJiIkdXrxg9pRm0CfOPPznHWqz94leyH+SlbomiGdTlB0yLeZdbMDYTH5BZ7b6Lk+7CBzhSKSo5V1u3jFIrmQXdfzOjym/8QFfR/Ss1g9CxVyl8GXBD0ZRvEgt2lzRtgkZPnuXYtKb0As0+07v3nP6TUe85gGVV0Mxy5yYyLDZwmepWgobMB3qzVpWc7UtAGWTa56m7t7CPepawwOScBqjBuc8HL2kQtm/O+L99GMMoPBg0XKfLKzgWvRdFFrxnQI5BItAwicOme6sImYd/WbPMlgLFaQkvl61E9JJPJmTlASg93jGW3FhNxuCxanHZ6fjYassxz9tkCSiVH33Bx61p+e+KUX2DM9fb6PVqXwisZe4RP12/mcTSnyrPg9XKSkhrIisBocNhMmnQIJU26VrIRSC1wZb4r/OG3C6EoMs8nDWrl7FprmZ8/Qt0sBfSS8o4YKrQos3p3rSMFVm8nY+QHmPXf+Bj1jLIt2e+BFukNgz0c9729qzKssjlEuebTthpuCsyCsK2IiXRHyBGCzK16kw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: b145e9a6-5d5e-4a5a-b399-08dde9ec5553 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:41.2099 (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: T4cXOhAkGaNZkt5Jnwr1mpqVw/dhnw9CWYJtoWVnsyq8dbpZJj1rDfVcUWzVfSBAy0LjNlqWrPnltRWP5I4YJw== 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/17930 From: Stefan Herbrechtsmeier Handle the git submodule setup inside the unpack function of the submodule to simplify the loop. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index c3e7189a0..37f82cd37 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -198,25 +198,28 @@ class GitSM(Git): self.call_process_submodules(ud, d, self.need_update(ud, d), download_submodule) def unpack(self, ud, destdir, d): - subdestdir = self.destdir(ud, destdir, d) + fulldestdir = self.destdir(ud, destdir, d) def unpack_submodules(ud, url, module, modpath, workdir, d): try: newfetch = Fetch([url], d, cache=False) - new_ud = newfetch.ud[url] - parentdir = new_ud.parm['parentdir'] - if not os.path.isabs(parentdir): - parentdir = os.path.join(destdir, parentdir) - fulldestdir = self.destdir(new_ud, destdir, d) newfetch.unpack(root=destdir) except Exception as e: logger.error('gitsm: submodule unpack failed: %s %s' % (type(e).__name__, str(e))) raise - local_path = newfetch.localpath(url) + Git.unpack(self, ud, destdir, d) + + parentdir = ud.parm.get('parentdir') + if parentdir: + module = ud.parm['subpath'] + if not os.path.isabs(parentdir): + parentdir = os.path.join(destdir, parentdir) + + ud.setup_localpath(d) # Correct the submodule references to the local download version... - runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=parentdir) + runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : ud.localpath}, d, workdir=parentdir) if ud.shallow: runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=parentdir) @@ -228,16 +231,14 @@ class GitSM(Git): logger.error("Unable to set git config core.bare to false for %s" % fulldestdir) raise - Git.unpack(self, ud, destdir, d) - - ret = self.process_submodules(ud, subdestdir, unpack_submodules, d) + ret = self.process_submodules(ud, fulldestdir, unpack_submodules, d) if not ud.bareclone and ret: cmdprefix = "" # Avoid LFS smudging (replacing the LFS pointers with the actual content) when LFS shouldn't be used but git-lfs is installed. if not self._need_lfs(ud): cmdprefix = "GIT_LFS_SKIP_SMUDGE=1 " - runfetchcmd("%s%s submodule update --recursive --no-fetch" % (cmdprefix, ud.basecmd), d, quiet=True, workdir=subdestdir) + runfetchcmd("%s%s submodule update --recursive --no-fetch" % (cmdprefix, ud.basecmd), d, quiet=True, workdir=fulldestdir) def clean(self, ud, d): def clean_submodule(ud, url, module, modpath, workdir, d): try: From patchwork Tue Sep 2 06:45:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69400 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 3A55ECA1014 for ; Tue, 2 Sep 2025 06:45:56 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.127]) by mx.groups.io with SMTP id smtpd.web10.71239.1756795548727092388 for ; Mon, 01 Sep 2025 23:45:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=1dYdnmT1; spf=pass (domain: weidmueller.com, ip: 52.101.70.127, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OL/jtss/YukhURwGTXn6mPTve7gKVqsGimUCeEb9nDzftWCCyCc74Qodax4xtmk5VzG5qZGYgU4azTiqS9n4CSQVIA4UAsn/z+QFXmJgvOB53ksQxs5qv7SH7ubq8flvIOtTNXyjIlfyj5FwyaXX+WAZ1PRNcME9G8pZQbF0r4hkNzpcu+LnGD7WIsB8fFwBeybwGFyUJbOfr4Fa2dwNgWuQ6RFEQ6R5nZW2lkDSnTHDKUTCgkeSsMIQlPhi1rv9Vvln30Z7pU5p82od2Is0NUP1VTBHBEjH4xprgWps2mRd+NCewKPJ/mHcjigzz2MFmRsYIk6Zioh+l3f1B0VFEw== 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=0C0ncIM97PI5xi2pakYWr9/GC83C6tNLzuAS9YBEdKs=; b=bQzr2mkfcPgEPTZn8vC+/qFW+GUf957E5KFHeW/jhlXu9TDUdQbdii9vtLEJVpaJSIl+tTAHU5gosbENvvMWp2Bl0r1eq7Gg09+2GxWdVHqDVI1ZMR7u3NYSPq90Njfy6+XRwfmFFdArOi9jrXqM9RlKknzU+GcFZK+WyM2CymWGhioBfEl6/Z7jKSwy2/orF2gmtX3hXPLoogJ2imzYYu68zpUc5ty+CU2ASBfXgWzGJNH6cV4nUrLFTY6ge8v7j/o/ua2VFw5l0nhSulJ4PYjcVVTYFJ4BCT/m+nOQuFnoaY4INCuwuKAv9ga3oubptoIvEHxeIgTHEnPY4MGwdg== 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=0C0ncIM97PI5xi2pakYWr9/GC83C6tNLzuAS9YBEdKs=; b=1dYdnmT1UnT319ZBHGn8O3phSuCgKSLSIO5ondhH+lwFNRGjsN0muRzw8xwhPWY+/U4r2dtvqO3y96h7RWSz7YMa9/JeZONaLXEKZUtJ7CB0tXnzn62zAsDLOX8CIgCTX7ErFaj95kuQY5NPkStDZRHQzlb8AR3BxojudNEqtlPoXGbnuQoONXuwuuf6f3TDa64EZ0pkloUpiVNLZTlOxCIafN9rtghe4HNTCWvOwt0k79Ms+Tw6qzAXLifLy/bAZySI9BDKJNF/jttdek8s6fq5N+Bc4ZxNsp0EuBtjCbqXhF5YthZ9PsWgGE4P+0WirgvhDR5qHLinvGYArU+l3Q== 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:46 +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:45 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 12/15] fetch2: gitsm: remove redundant check Date: Tue, 2 Sep 2025 08:45:11 +0200 Message-ID: <20250902064515.30879-13-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: a6c65d79-cbf3-437e-a738-08dde9ec55a6 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: EXsDiFMguONBLl3g5h3i3UlojhnZIV6CR36A+u45BVaz5E5Xv5zxWRaDLm5+/6iUirsCq09w0EI0JwgDUmxMNEU3wblgHAlG09fykpUmtcKW2wUk1pLminWWOK3M/S1go7+CZOr7qTrPZTl/spPZcKQ3sJ/xUCt8Jrk3rNz0esSaoS5UfyNQ29ix2W2nKdTV5mSpUstW1XHC+L3kTgReNM9ZiPdrgIEl9h3fzWOk1bKI35o3ejhOWI5LX5DnBGCVA8paZMbeyHeJIrDR89ZUm8tVH4ik25Haglr4h9xVvYDHkk5bKcdaVjSALhMeK0VrJ01SMg0LpMyV0WT680rb1gew3wNDtbMijG2AVDpau+PaS7um7Ci4NQ2TMu23J7o/O24Bgps7DFKmXrlz1kaxGPYmDp8E3+EzWWw0VvNLNfrUT+Vqi6Msb6i3IlmWz5K88/dUuRlEPDgbAY8V6AyXb1PiBBrHlHa2uJxw/yOnoLZ68UtTNLGTPra8VXQh6hCZPD0WM/1FH0043v6q4HatJOplLlIaeZ5OBpnOQ2QuJNEzHpMc4/2MT7G45kPr94NOjXJPglUdADsIJ3EsrcYSKplyRBIzW9E4qMZLRtu5ASskTTe5qdca6bhot6nTRD1uULGvS3weUvBy50Jy4TqUtz4ghvX1rSrPUjI8ZafAwf6QBQYMc+m5E5IQYJlP+x0KlSl8SNyB+W91UiFo+Bs0HBZ/fX0krh4Ru9vvmwqdAXohUdsyGOfy8BpbsgNpYOSJWRdaa4y5klMY30xPkX+fGAiT/4NdOIo0yjQP11bcblNE34YaEwuRmFz+i7BDQ/t07D47L9OoYclblCEGJWg1J7XVQxW1BxrxAqS2MPfQnejKARRt22LXuvd5DhDuu3yiylTtOgNCdnGBZ+ZbmWR2tRKW79BF4EiA/ozYv3D7zSiRhNE9PsTHl66WeOwEvp8I6q0CIVHZU+fUgMSOWyzHBl86dY4stKrrM0tbAJqK5QZ+V2ncCk94SZVKVmeyOxzdhC1HpMTfipYvrgUpiiYWAI+UZtBg5X0T7vzsyb0m2UcuzsLapr3okgpK22E7hsvuoyMMJI2I29hpjCjRZHtftUa8Mqrnz5JekMUuSy4mAqvHlZ7Pqwez2muWk/lotMcggmFFrbKa7FhgiHESVT2M4yXgZXk7vOT40lYLoHm8X888uZjomD7ctpdAXCcaNXPodepQW+ZuM0O05Iwomj692owgvU4daFqr3W6qlmYx/gmRRXL9jKE6Ar+rliZry8eAmm0f8m8c28Gd42o8OKUgZFhrFg9/Nuvk0L54YVCUOQsIVpgI+jDKT7Y6FJepT2tYJHfXOL9BFFGJLnicpdfbrzN1cHY2SF0bPz7XEcNeMxIBEHgO68hBDub6vuPXOB7OItsebYtkW8yFppmn8DROJ4tZnmuNJ3Dn/UVB7JS6Yi2ddSyHTPG0gdvDxs72keozyAAVXzRcCRmBCT8kY1QmQA== 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: LVTOJMa4C0KshM2G51SlJaGwlhvEfHi61NAmzOjSrmkod5WPMHoBjcARHWJvQg7L26bLHn7km+Sez2xr+x5tYW4TDjyNGnifEZDBN4DyWsHjz4E+x1qmjocLYSKL6tgp72NLzrTLPbCHd/hpTXz0YvdlilW2AI3leZcWuFnJib0qI0qPNaUNQxSrARU5pcLBPM/iZ6UXg3u7c7elbrGb/CMJW0HUWfRzh0PGD/GSV2qqaCYCn83kvUGuZy6/7r61HNOrSgdeNCzIlE4vtF3syfj4XZVjxn1/8Z0ga34rQyjgKiBYo8gZFlk1i3STuvEhXmiw5nFLkhfLIshFXwdzt/+kPFyX4gk0xv9jn6MyvE/5l7KYGw8RkF2lZtxxJ4GCm3EGXd7oMgEsuAivRj/k0deG+AjIlyn+xVmdULtbZE0mtqll6S6/WfNuIJpm0i8AEg2AiicISXSpXj1z/Eog4GSnIcBcM1MJxODqKv4y3+cN3e9bw+DEr/o1e5sPehm/uYM3IrfZP69WtVQmuW+1TssxPniyNMnao7kHXoGUAxNAn5ZN8MosxIaBga6RoZmbrqzHvAFUMlG6UwoZotoGhenLbCMmDHekzDv/lF8s6RNpx5jY3ogfs9i5G8/wyPQu9hinWpAdBPRS0ST+8vwZ4Ghc7k65ap9Vz2FK0rgK/hs0yl27XETcoCqxXiZK1BNNe1WYZFrVlTR8uMZkDzxezUUjPdayV+ouMgZGCe3WQn2Fl4tXGqqao4B2caVMFsZ3fFZJ840tz800prAMDplpJoUwxfNF2E9K1AcJiH4FohFb/BSKBcKqDoekeBmA0TzJ+FiS292jna/GIxnOPY1BvvT8oCH7CpTKCrnQVjshV+jVDe8j9phDMsEBwITTrPIZRFoNPIgtxU32o8UJnnqdGOcJifbTRmlR/r2kAe/wJtdo1cjg6ty9QypqpGvi5EtB5cwA+BNcrQodCE1YLjSbo+NZLYn9/QD63/hF+Ha+OsduDtvd7Z7HVCETsLqAwfXGtaWYk8NWSpk5MpSdVXZZWpKDNL1zY2EoG1O3/PZodiRgmqAljQ199QpFjOlkweMYvQOOiQjVnQYgIORuhL57NmyYqHLj3SpWvc3QyU6TdJhXAt270bvPuCY8nEcuaxHrwtENjglzCKKeVORCtA8+iBhVwJBgBD4LrT5urr/xUvJRenKq42ghYkoFCYsaNprZbnuXt21P0l33uykbFEMtMC82nQwhPKuGf1cKmvtjT/VGu17CUf8ouZdR0Kf+WycWM6d786sHAYtSPL1b92NuhoMFq8KdBFIEYs0vF1DjpHTchsuU/9pB/wmn4+HSw1BUuX3+AmL7unFmSP/petC8tEfesDH8t4dCVkLruxlyrf5Q8mLCaY+AVQUdCx+9WsUHswPPe9lBDMutuI2KX6RC/G83dV3HRlCYaJlH8rv8TJuJOtL5l6FMff7ANzpuHvm9Y8zNI0Hbv3VFcZi1ajXr2ygDRvATUjlnX8zgZFiZdTl7zHLgH69whoQss0TMfzsPli8IJ5FHuIN6urh0vEvaTnNpedpX69l7TXH2+JBz2BLXX3B+PZ+AKoVLCTsVXcJlX4eKg8lnT/ReapRa3bl4/A== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6c65d79-cbf3-437e-a738-08dde9ec55a6 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:41.7337 (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: 1mKQvHcibROANS1vMt6LeKDFXHcLKdCOcTI3jNW33Z4pW9Q5ebAYG+evhFUs8oeM7hYODh1NNQtteOvp/DA2ow== 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/17931 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 37f82cd37..9afdc8370 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -174,7 +174,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, not os.path.exists(ud.clonedir), need_update_submodule) + self.call_process_submodules(ud, d, True, need_update_submodule) if need_update_list: logger.debug('gitsm: Submodules requiring update: %s' % (' '.join(need_update_list))) 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 From patchwork Tue Sep 2 06:45:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69393 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 0DCF5CA100F for ; Tue, 2 Sep 2025 06:45:56 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.127]) by mx.groups.io with SMTP id smtpd.web10.71239.1756795548727092388 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=HulgbzvV; spf=pass (domain: weidmueller.com, ip: 52.101.70.127, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=E368Fbl3meHdoQYBx4abHCcGWx5gU9+LvFrOnWeH3rIjKZAC0/cTMuGK7tZPurBMEtDse6hmgd5UHJkYAwmXui6C4o6q+LL2mmtiUAWJpcG6OW0sjeekki/lSk5DDhXmRi4agiXjojnl8Tz1IF75ljaSSgzTdzdSjUnSZkWCWz1hwLafUPEKgHKchO7yDjN7J9PyvOJPp0yF4MK2MH9mhQKTT+6xbrBtQEB6VUdJltKPsB/6EXfYWf/Wg3veMMAoz8b5dqBMi1x73yvQ7sEsFMwUU1yQd9EF6qkV1rOP/Xp0Cnoo7/tGBjbV+M8yi8bdnlvS7wN2AL4fpgjxaXlFJA== 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=cNKaSUcgCTqxYXsIVM8hG6Prs8f7CIYV4kBBVUmtpwU=; b=cFfhMirRh3ZGs9nbYU0d2jnK6GYUrPkvwNYVlzkifhq+NtlzTs4ulWWURf4vEkKE46LKwkN3gkCIKMBvVSK+SnW+yfQd5Ge3pdpIVdCnFf89YCfKjgvTqmWvgNRew0wzFLI7u+rXSunfqyyAFoLDIjn7QeSmVIBj+g39BGIGFHeBLWfloYom4ffhgZnUuxwEj9rHOGgs9dT6B6LlZQvTy7xQd4FDZKk8pJNc0y8KIP3hTos8so934rWC8YY/j4WWUMaAosm1gEU9JaezsVdhsuMN6e8obtjWj2OFvVM4ez4rHn24PvwSTGvOnfuwESeRLGUdopDxkoc0To0ZOE55gA== 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=cNKaSUcgCTqxYXsIVM8hG6Prs8f7CIYV4kBBVUmtpwU=; b=HulgbzvVDRf1ol9st7HOuh7rrhLnn00RmgFchGYzFnbqz/wgJpPjN7iS1kSI0rJOrfBeJMlfx3oMhcD3geCbVxti6ONCOsSIpEXw8iWcFr5sSHPlQw7hrbtRGZn7aWOnSQ4Pt6S2mhO7ILVewQxMrMQK0MDUKduwxM9rMOhRv7IeMvRVRq3NVL/ysGs4/S7+mE8Qyle0Eyo4edo/EV5tmtwPuNbVCuagRh7Rk0cc8k3UVSRqHVWGx1lp0Zud8HL+XqFWgzbQbLsgrXHCnvbP3QhCTVDbeCD2vVmPEvao5Sc1UqvACMAPzmaKiJt+mmmIYvHrluVm8rySacjNgyC3Vg== 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 14/15] fetch2: gitsm: use TemporaryDirectory instead of mkdtemp Date: Tue, 2 Sep 2025 08:45:13 +0200 Message-ID: <20250902064515.30879-15-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: b9e079c2-a565-4c3e-a5c3-08dde9ec565f 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: cThucnioUqLYl7wRNtG0I72/nrMm0DiUnNu0JQcxaEK1cGPMVhGCIJM2OCHwg57CXczzRBHbxZ0MrCQCnwfFA6YNl++BcS1jyrrYdgiU9qCjQTfumT5xDKaauVI7G71KTgXO5kW/OU81NF8BMKKdyJHxkUgyuove7yHDSt9B9S7hooD4JBNvAgQwYi7XR/PelapYIAbyeSfHZriB7GiuMX6Z9avFb+N7QOEbpQIe6lRMismY4NC9n4mZjerPy3Xgbhr59SfqsC80MVGVqaKqyK2fwA/9XZoM0CXFu1vCfx9wLwQh4ZmnJi/sYKiWaLu58gi2CDAAi+k9WPirnscZzimE9dLPyDzSxMlAhXqau0kR4t3gobGbkdqAQGEoKUE+MHe8LvEH0rGrPXqyTlcEFlTId7SKsEEpHRpQ5w0m0xjQnAspp3ecKkR5rprowyF3WFZJIlJK4jSAG3WdmJSk7YCld2iMl63wE7RedPhAS0zR3//OSz5aAYaCUfdR/CEywjSIEzUbX9hWI6oBNn7VchbrCTUjHOLWX0DNZVhglJrx4XUENSrVQYY43iJHNjkBmfA/rNMc+Ya6adwhNR8aRtvhflDoR3gMn7nZQ1TGRzjDDX0zsyBC2gt8/cgIhI2NPKwVAjhbxB6x6hLEs1bb5S12YSGnxbE120H2iiW8BAO3IuBqFKrOmsSbp0KwaEUkhw2YbjX6DPZELLzo2TAnY06yizjpgvES4luGgc14Kg27B/oDXG5b8GdEli1U8LR/+uNqyunJXBy0xBYuVUkCXIF7TmVlMViXhJSM9qLbt6YbWtii6hYu7iRx2hgIrlRr4rNIwOlGEunqVcqWxCiAuHwRPmeYCpyGaD6EYoADpYQK5IUdFECmxXAFU3XXifWtajA8iHDz8OR5RHguu62sdvGrqC1Aa1DMatzwoiAe2TY2Z4Dfe22dfycT4bfU6evxK+x1XiY+G1JdcC8G1qQT+z5/ieELU3Dyj7OmyUvUKnOOXD5UTCsAOZPNT+CHWJ98fJ5QlfMCh+lNS5dBbZkQYU5AULKT+hzsvtnYjEP5cGI07CQVuhXK4/gocsQa+P0UeD9SC/Gbg3yNHXfXA6Sc3It6cwEb3SRJS82jPsoOlt+mbZZnF0ZpPGKgSJxO18ksZ4g/LBKxFHS/aLShsXbxkqut42ojGxJiHYcH41K8XSS8Fqq58ZCfLlI9ZG3zLTXAmRQXncqaTKdxHdMTwTUu55+cKBLfs+St7up44L/AWdYHEV2pc8cGR0/awBjJQZizIMKYbX4HU6iUcFlaO7gnI+hYDnksn4Z/aqNhBnS0djmY6AF3g9Gt3D7IhanInAiQDGUd/JalF696B75LV1N5ijcB0xDn9hLiBgaWd76AsWEvXTKzjnfVV6dUPR2GOKluoqV5SJA5zCQQTpN/fGclapKs7oNIq44H+x3PmiAah2aQqRcxqvl6HP7REfKB52pzbVLV7tI/KI7GeO4PMEayWA== 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: 27FAL+xuqmEY9LJpJNd+qoq1IiA5seRFw92UMbAprm/NDGRRnunp7gr0h271Y2ckpCdvQRhf98h+N8lNl9HaOkmYzeogyFWtVHTKqDTZiUmzK/VxJPYgedMPfAgGcUP8wyCcItjviHYLtAsjgdrU1G4sI6AJk5YGG04f1K/AyabkNMlueUyJUBKXmoiZ34wEy8ab66OCAKDJ6QB7jrryC8dGv/jYOt7fWtL427pbZ1BbFjl9o2zUUPx7a8Ej3W6bj8gEkMBceLMMs1uCSj1opOZQQYWDkXBMv/+HN3R8pM8ZkUwwD+gniD2DCR3MTZ6EioiiQnnSIkGW7/2GxPsxKImEv4hjBadYoBGtB2PeZjr4o1ApXB2gI3PTty19HcJP17zbdos7LRX/MJLP137qCxbN2eioapv/g7QzOoiSHZV8LoHItJ8juxyy7hmHoow/nojiT0PsdinPMKVCnvtfYcMC/aTzhkutLsLpufJRzASZ8eLCqER2zPmhdAx7Wv+AThKeoCb85wm4Gisyv9Y8OhK5dHfvvYcbdX0kemsSaaqW+R8L2BEXFJw/EBulZGh+vtLUoEZAiwRwkEiKMxp3okXbD6TQaOoW+ETLW9hqR1XZ5YNLXTbCEKikiRqBTRCepiIJScT8QCgySHsdH6cZ8sajI6YN6GthwhBj8VrNAxLDh1bci6DurtWRI4ZDxm0WPpDakKVzF94nmD3BDHkd69vugGGQa18i0GwHuXnehG3lBeAiIICEtL1Qg+ofovyVCru1tYbnaq4s+jWtWOFGfIZYNfwTrp6dFXx8dbyihj6bV4Z06j388yp4xCAywSn91xFXx6ZLVx7Qdy07jzyedXsecdueiUvC/cHd6cP9/zg7mV43deu6stbkD8t+aAiYYY/ppNbW0TLXnQ9Wc2eyvrbsCtq4CmkJXVloYiUKgJKynSbmoHXlF/pGeMhq5FtVpIt2n/FpCiYWn+QPURjxRp0cOmTVQcVzjvBD/2B1ohqBaQXWcqtcE40V59F01trqXSqJF51tDO5j/zElOCVkeSlCHx/MbSjDqDOicYeWW1ZB8h5QLCS6DORCvq1zMVFQIeRltUdg6icEtvf8fFZzeK4agoqwzYVHtg5PRo0ltiLhWoq/95wpyl9bkTaLCWA05H9n/Isx6vHzEOHC+mCjgdSuIv/TW53HgDDzo7MIfPjlz3ZW6JpueSxZ7tIMIAKoPkQyJSumhauyrKmxb9jYyvNV/5bygINUuzDsDFrIauWztsLwplg2xrtQTIQaDHXrxItiQ21F6QDXES1C47PAh2BG0/ByDQTDrUJFZHk+wnXSosA76xJbXev2TGEoX5lmTJk3oXtiZ4+gUVicMEAZwB5qNLUZU7UrptA9cQltr9tCBCnJvGP3tyLLbj1iQ67qyEfW2ai5AbDjhMxrJSImKU8nNwFRNZr2yh6O8vUEbgG/HcC2+ssbJ9TJwhbib38MBtJEpvoR2HXmsYtMoXePlcoXxsm2uD9EkUaplRuHNtomwPSzkom8vOnuivc6ivmK8SHZuERS20YZPkfzm6djFjcL0Kj0YZcpFr0pmih3oyxba3PK9B1KiRSTUZHi1mqoT8E+2Euo5IOLMtub6iDnqw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9e079c2-a565-4c3e-a5c3-08dde9ec565f 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:43.0782 (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: sW/qYOThMnmxsLCukSU+Y8Rx61EJ0gD6xYQNniX1eMkNoJhR9VaRQCZ0hJfiluBiw8fcDSmCfMJpEuliVE0RHw== 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/17932 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 31460b19e..4b6c88baa 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -20,7 +20,6 @@ NOTE: Switching a SRC_URI from "git://" to "gitsm://" requires a clean of your r import os import bb import copy -import shutil import tempfile from bb.fetch2.git import Git from bb.fetch2 import runfetchcmd @@ -151,12 +150,9 @@ class GitSM(Git): 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: + with tempfile.TemporaryDirectory(dir=d.getVar("DL_DIR")) as tmpdir: runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=tmpdir) self.process_submodules(ud, tmpdir, subfunc, d) - finally: - shutil.rmtree(tmpdir) else: raise bb.fetch2.FetchError("Submodule source not available.") From patchwork Tue Sep 2 06:45:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69390 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 F1236CA0FFE for ; Tue, 2 Sep 2025 06:45:55 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.127]) by mx.groups.io with SMTP id smtpd.web10.71239.1756795548727092388 for ; Mon, 01 Sep 2025 23:45:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=z23P9PTc; spf=pass (domain: weidmueller.com, ip: 52.101.70.127, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R8XVOtVoDOwkWs9BUj9RFp55kTw0XkzhBlB48guSMZqKNXQFexry19oGzGO+eOKKTunqb9PoR2dZzwdKryWdHV4QY2C8cTGvKvSmmzdEWC6xH3X1JqiuFGW4AVxtkPxRawTa86wVZBnqo1y1vfZaFJnlTtY4CIjgM88PWz6KtQywcfGf7Nilpr857qERGVjvaAJ8UD+n1ILNbEUkmKMekS3GnegEqJxwGyu0OvrJOr49hCfndKqaucMeBscLjhYXu1gErQ8qAbFEI9jVpjLCGHxbHy0cgPpUJQLApYenjr/lnemP+8AKyWOecBaXXtJjTwo2pkcvG9YYsX42+2OE2A== 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=kMfe3hS6vB70UmKAfQ6Pt6VlEXcWApsQNejx10t8Aw8=; b=fJiY4VjgMosdcLXn2tmZ0cUffvNoatVYTpKnYEBKsFFasR6M+pkuTdlJdNd40p/D5gHeYCu8Qfzs78OfETx+wpaiMkUNenEMAIHsxryn2g1CtHObD5XPjySk3WRPGG1KrotmDGG8haMh+tkTUcg2PYkId/hbZekweS/C1eATr+MfFeDjrHhKCmG5A/jbsv9cAlDckrlsJWhJGaQotn6LYNnor9Z/jrc36eF9k5/5aj8rfGNDoNop4aku144aDWy4m0Afa7hGBNxf1NKs3zSk2IYv6fYZt+ZrbrcaikeYfU7MOavIC4OaIjaT+yeQrJTto/7In1T4YMCedORwEdjFrg== 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=kMfe3hS6vB70UmKAfQ6Pt6VlEXcWApsQNejx10t8Aw8=; b=z23P9PTcwVp9YLlsARAdVlyY+VxeDveAjTZTmHLl9guf9AvcFiw5JroK0ir19V9Obn9Ub27B/5Fsjlp1E5lp6lTm6kTMSRsq6AUyi/EdXxpitFqVabgRPoc/vZmlToCvyIn+q8JFZu5D9+LJt4XFCun3ZaGRZGUX1zCWcyAL4yrgMd1tLI7i3kW/dr4p4Qd52pCYxTCdTQrKCHFj8FCW5fot8QgN0/giyeqy4bFfXox8YugyR7krRH5nd1vvYxyx56OJximGSqqFDSth62SLais3fIFOQVnEcvo+W5AfWkmv1GANrLk+yyaqoEHI6EwdxGOL3JQaoqNx6AvZhnOAmg== 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:48 +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:48 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 15/15] fetch2: gitsm: remove indirection and nesting Date: Tue, 2 Sep 2025 08:45:14 +0200 Message-ID: <20250902064515.30879-16-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: 574bd6ae-e029-407b-eeaa-08dde9ec56c0 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: LROVNs1ttBtWArBHjsuIOKpgGX2vUJszE698qu3dnUW7sWn0eNWzFaX34KJjf79Xbq95DllH5QnxS3A3sSgp+q84X27nJM3paJ74Qn0Vwpp+lOyXRi2bDgUoL+9Qqf/jWiK1Y3YFNprKDjg68bdSbNXAxP3Jc/Fx3r12AS+k5X1yh3k4PJ2YbJzyQ6bRAkOEatY1kFr4wWYWWglkIfx2jIY+GYBxf04e4/6hPBLAWYLvn2n8OZkGZaCHJ+tFYsHDnGv6UmDCaH+tDXCM6grGTk3hmKT1fnzVlolPhw51h13m/lNQm81t5MM7eg/epe4E8ARU+p/jYsq1BW1nvLJDjXTqylFrwvhfWS9l0dXZJzsPKryvRmY2RvYTV6XYXXNUbGFin3h9TG98xx6PwWL1yrAbRSvbbZUrjaO9qfK+3Nq0F7P3WkjNmz30ChvmiqEbR0UGwS3SmqCHfDVwtcGKSzrD6xc/e44xeqz2LMmYPjlw/ItkHsNq9z4vN+7Omy/qidzwXrp+jpYp2Az0FTEH1hB8scFjHGzHTQZ7A2pTdxC/rgO8idklEw5Y4ZvfZRfeQ/1V5upUGlp/nub/6uMzaqqB/k0noQhgqohQ/iYYNG00ln3gLihv7dyzUVnqPiIKrkdpgpj9K3MWUx09CiwC96vQ4cPN7b0QA+NoZVD017S5xS6oSP6RYxGHm5OvHIY2/hG3sGSmLAFha5fCOORAQzcaG6kdrHuNMnklMGGWFh/WieKC9FnIwUzg+E2AolPI4kHtY0OtCfRqbWowPARmizKTrED7mwOAzGn9oF2AlKVeBvQ4AtQvbZH0w/Dp/uADTqS9XKyrYVkw9K6df8gCvXVVN1F5QG/x93PQ9f2/5E32U6kHLSUfJHJt1hA0ksJs7NTA3QjyAU9UVjlXhMhCzg8/Z3d38/Osyxm8Dd02cQMfgVQuKCOpY8D11JWxOubnfO44Xss7PjsrsmvKMPCGplCE6Qvs3X5bpfSF1K1sRwb7cmpcCO8XXOuwxncRl6NL7UA3obAcmTMdAX1cOyY+4U+83tk1mwGTumGwjWRyZxbjzQf+Z4SKoJ4iOR+m1cJ9EdR+XnPdVAoMeFKFgxDR/x7ps6StlvnuDj4Me84JK5yCXjImHi/tCYgXBIEDq8ubrAh7vEBfysJndbWr/VDs34lE70KF+F1O1UVOV/ZjPTycsFUnXidYtfzGXlg6dpjYpPwHcFtXKOhHXyVPuMRdP+o3fHMwcaB8kcYtLgJnOuip+MfiHNFiGBFPcwAGLystberur3z7WTeoXELbTLWsl3v72WnqpS3t3dcwoO9BSqilGrXxV8+b3hxxMCsH8BFH+k/ofayULrW57uxL5Lz8JiwTuBJDuOFI4LjFtXMfVS3rR5io/R0u/rWSL0JWSTwJuyDozuEw8zBwD8dANjLbeq9Wwis/jUJ8zY5NTfB4lpxm52/U4BSCxqa4zSmu0M/ueO6vDCtxfPBTCTaJtFV7Cw== 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: X/YndPymLHpRgCNiDjnthAhxGvTSMKr1xtWyesRHtVrrTw/wfRt4XZuWgneHbnFgx+ByFwRq5Wt2hoEsldLOQ2+HIYrJs6zNmcILMrcPjns4FPh/chij662N4OaOo+ZwjJ4ZRVtNGPD3uDMID176s/zBsKNJLYaUYM0+Ijae1Z9JKc/69gq/pTqfnSxmSW0hYVpEru2yNinhjhx+ZRmQdLTXMbXviVK24whwk3q05tAVx17LV6w65GN8uVq0Izcc5gEsllCJN2ep0/YKJ/BSj+GFih8STpqGw3yKZyVXAe9Xh82lIqxXwcrWe4DAS960MP1Eo+bvOx4G52XDyBCFVZiHqUM1hEoEGtXzSxCER5uhDvovW71LeirgwVdzsUzsANOee0DYSLWw2qYek9bYyZ3z7MSmzxddklSYTJ4Bk7xQHul2P5/mbFerQe4/pZef3IPDPHe+22RGwVnL1/Vt3ZfWergkemtS/ZI/KRQvjt9La+7Kvw9o4+iJ1Ofi9LoxBBnCQLVqdGwd0HN2iHcXVpw9buXBhMIJZiZPXj93muKlcOIDg0jVSZTYT2BOz9hMGpuH5YXqDAzkT1ZFpYt7U4wzz3Gv7uhxqM5vj7JmgxKwZdZ4gFl7M9bHWEfZr2UQbegXDJB/BD+5UgPrRFJhPBQrnfOipM32lnJJFySdD9PiISKrezw346SOfZerwTXhVzzEKQNYgXFy3Gv1sau7+Re3wMszY825S6+acjOOO3JAZ+iZCSQy23UjKyx/semPeZVsBfBpbN1h52zrwCqbqoPwkEwprcK/rhEk9PDzc9TJT0wjULhkfEKWUxh8tZw6QNuHhJgKe6h7olCbpjqbsVsGr2dReOAaCNK6vhtoctzZdwFIAYa/GpCF08CXmQATB7L6MCbg81Iaa3IQ88ok0/cSNImIp6EkfJfcfQQspTqpSCHOcySSpjH0Dd3LhpFlXQuQC9I31bMIMFotkfnsXZXwD7QyUbCP1vhvwryU4Ar0Eiw2BBRmeLBLi8Hp2WDEvOuGEHbxW//YU54iaKcnueEQPXZMOCf8zQKS06v3jOry2+R+WqAufWcYSVYiDgI4xTnt2QxQOA6ofQ3NLc1JNvLNNVXN6thkFBuf5ujguzU8lNApaleAdug9seJGGadRsrv+PpD9otoFsyFb3ZMb6EXkmgkZ492Cotm7P8LMffknOBmTzZcTu2rcIAWCCwrxsBoU3IqTzvIvhwtkttNR2k2YvSOzotDe77mfJfKT++igtJs4oq9FGn9u9gVpd3iW3+fBQzJvjdDxnZSlDcOZd7bG4RnpYwBAAy/ELYfHBoW0Oj+qTH7y6p9VuFChHZHFbmNbrm+rpZMZe5K4XAKJzey+fugtkXBVKLMijYfld3UtYeYSlYLBy1yRPrRmtiwnVsgmxLFbMWYhrjtc7I5+Uq0VEqbT+jxrJApWryEsSnjyooaqwiwQnDjA0ZQKhW/3kPUZyBDS+DfBqCzWN4H8K6nWXG2I4uLVKGHyCbEKSp3oK/xbo6wRVjuSoWtadRppqWZdS29/lg4Ug/pmO4gKgAa1KTOSCeA7uV96ovFm6m9M1VRtM36ffn4Jgh/DrgdT5s3Ex9T/Hf7E47EoHudbkA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 574bd6ae-e029-407b-eeaa-08dde9ec56c0 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:43.6065 (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: P9ZJvP2dDX9EhnPCi2S4TMXDgy2LL3DC1wafhuNAC7ACX4cYZIHbXRsS7d2n2SAWd3EOdsbv3FPeJIIka7eZWg== 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:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17934 From: Stefan Herbrechtsmeier Use a single fetch object to reuse the fetch functionality. Remove indirection, nesting and duplicate code. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gitsm.py | 98 ++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 66 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 4b6c88baa..5ddc81f86 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -33,10 +33,10 @@ class GitSM(Git): """ return ud.type in ['gitsm'] - def process_submodules(self, ud, workdir, function, d): + def process_submodules(self, ud, workdir, d): """ - Iterate over all of the submodules in this repository and execute - the 'function' for each of them. + Iterate over all of the submodules in this repository and generate a + fetch object for all of them. """ submodules = [] @@ -91,6 +91,7 @@ class GitSM(Git): newud.path = os.path.normpath(os.path.join(newud.path, uris[m])) uris[m] = Git._get_repo_url(self, newud) + urls = [] for module in submodules: # Translate the module url into a SRC_URI @@ -138,21 +139,21 @@ class GitSM(Git): # the user (See comment in git.py). # So, we will not take patches adding "user=" support here. - function(ud, url, module, paths[module], workdir, d) + urls.append(url) - return submodules != [] + return Fetch(urls, d, cache=False) if urls else None - def call_process_submodules(self, ud, d, subfunc): + def call_process_submodules(self, ud, d): # 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 if os.path.exists(ud.clonedir): - self.process_submodules(ud, ud.clonedir, subfunc, d) + return self.process_submodules(ud, ud.clonedir, d) elif ud.shallow and os.path.exists(ud.fullshallow): with tempfile.TemporaryDirectory(dir=d.getVar("DL_DIR")) as tmpdir: runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=tmpdir) - self.process_submodules(ud, tmpdir, subfunc, d) + return self.process_submodules(ud, tmpdir, d) else: raise bb.fetch2.FetchError("Submodule source not available.") @@ -160,51 +161,26 @@ class GitSM(Git): if Git.need_update(self, ud, d): return True - need_update_list = [] - def need_update_submodule(ud, url, module, modpath, workdir, d): - try: - newfetch = Fetch([url], d, cache=False) - new_ud = newfetch.ud[url] - if new_ud.method.need_update(new_ud, d): - need_update_list.append(modpath) - except Exception as e: - logger.error('gitsm: submodule update check failed: %s %s' % (type(e).__name__, str(e))) - need_update_result = True - - self.call_process_submodules(ud, d, need_update_submodule) - - if need_update_list: - logger.debug('gitsm: Submodules requiring update: %s' % (' '.join(need_update_list))) - return True + need_update = False + fetch = self.call_process_submodules(ud, d) + if fetch: + for url in fetch.urls: + urldata = fetch.ud[url] + if urldata.method.need_update(urldata, d): + need_update = True - return False + return need_update def download(self, ud, d): - def download_submodule(ud, url, module, modpath, workdir, d): - # Is the following still needed? - #url += ";nocheckout=1" - - try: - newfetch = Fetch([url], d, cache=False) - newfetch.download() - except Exception as e: - logger.error('gitsm: submodule download failed: %s %s' % (type(e).__name__, str(e))) - raise - Git.download(self, ud, d) - self.call_process_submodules(ud, d, download_submodule) + + fetch = self.call_process_submodules(ud, d) + if fetch: + fetch.download() def unpack(self, ud, destdir, d): fulldestdir = self.destdir(ud, destdir, d) - def unpack_submodules(ud, url, module, modpath, workdir, d): - try: - newfetch = Fetch([url], d, cache=False) - newfetch.unpack(root=destdir) - except Exception as e: - logger.error('gitsm: submodule unpack failed: %s %s' % (type(e).__name__, str(e))) - raise - Git.unpack(self, ud, destdir, d) parentdir = ud.parm.get('parentdir') @@ -228,35 +204,25 @@ class GitSM(Git): logger.error("Unable to set git config core.bare to false for %s" % fulldestdir) raise - ret = self.process_submodules(ud, fulldestdir, unpack_submodules, d) + fetch = self.process_submodules(ud, fulldestdir, d) + if fetch: + fetch.unpack(destdir) - if not ud.bareclone and ret: + if not ud.bareclone and fetch: cmdprefix = "" # Avoid LFS smudging (replacing the LFS pointers with the actual content) when LFS shouldn't be used but git-lfs is installed. if not self._need_lfs(ud): cmdprefix = "GIT_LFS_SKIP_SMUDGE=1 " runfetchcmd("%s%s submodule update --recursive --no-fetch" % (cmdprefix, ud.basecmd), d, quiet=True, workdir=fulldestdir) def clean(self, ud, d): - def clean_submodule(ud, url, module, modpath, workdir, d): - try: - newfetch = Fetch([url], d, cache=False) - newfetch.clean() - except Exception as e: - logger.warning('gitsm: submodule clean failed: %s %s' % (type(e).__name__, str(e))) - - self.call_process_submodules(ud, d, clean_submodule) - - # Clean top git dir + fetch = self.call_process_submodules(ud, d) + if fetch: + fetch.clean() Git.clean(self, ud, d) def implicit_urldata(self, ud, d): - import subprocess - - urldata = [] - def add_submodule(ud, url, module, modpath, workdir, d): - newfetch = Fetch([url], d, cache=False) - urldata.extend(newfetch.expanded_urldata()) - - self.call_process_submodules(ud, d, add_submodule) + fetch = self.call_process_submodules(ud, d) + if fetch: + return fetch.expanded_urldata() - return urldata + return []