From patchwork Fri Sep 5 06:44: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: 69725 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 E0CB5CA0FED for ; Fri, 5 Sep 2025 06:44:44 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.127]) by mx.groups.io with SMTP id smtpd.web10.15209.1757054681032438910 for ; Thu, 04 Sep 2025 23:44: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=6IP8p3qI; spf=pass (domain: weidmueller.com, ip: 52.101.72.127, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DLiW8QN+W4QJQGiqDjCbElI/C+pyPJxCQ79l2fJiLzSF71+IjiTfpZIkzG/1BFuO4q3x5pSMaMLDuir0OYv95H27WgWX/rHF37LIY5/WVzrcomFgBEcIJLP4+E1rvbWwjXYJcJyLF7evjwmJPZ99KEyPzoDglNCVceTLUmz0Cc9PUZ7Wyz3tIWEq62U73KHJqA1Z8dKc9J9Nn8wHw0xEogvd/Ca/eCJnuOXPFFWUrxMGFFV+VC8pvUqPHuwxUKGN6ZJewyEOc4+7SIgPttw2hbKygN29oRCkadT7jTtWL3Syqi45PdPCBVovVJVC8PmI8eIzueVf1OQJRGxNs9qeAA== 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=u7a3KdtBGjO2oBkCoR9VGELlnjTARRX4RBEzPLFdTvo=; b=EAqZKeB/fdzGTF0SiGeDhMTd+SXKfJZv7h0KcdxbM8kAf3O5yCo4RQQAHMSlQTqG0chz/y0vGcSNx9wdw3rUXJYvn940BfSGyeEMYS7qjrkRJpxalWnngi1117eBqpVUTd6qUKMZF/3LHQVKTcn7STh51CxCuEkqlCQwKDKI7rzS+cDQxUknVtbaA8h3eIHHHZCHoyuEzn1r0bEtD0CyDJYRAPmxP3buSvb6T+ilGSlwGf27tj3SZSdSFaehhZ6Az0kLMXb2SXtuM1ho/NFPV0ObelUs2sC89mY6BB6EFYjlvj4HAEyI9bAyE6NbfRSP10mQxAW9Pg7jVFxkpCdgWw== 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=u7a3KdtBGjO2oBkCoR9VGELlnjTARRX4RBEzPLFdTvo=; b=6IP8p3qImlsQjTcWOD+8GbqdbBXkgcYddevfvYXNuFr+LUS+PhKMVwdyliL3O0lrlDxpyaCnMFPNywMkPwR+QEWmLrtV0H5mEFsRhCGEhBC0ogTbm9kr+XIIATfSEydhSDC82j7AzWkFKYw+LZtkfUzu1z5thkN9FdscHb0XCReu+io88RPc7QLjL7ZXLqaMNyCg0iG+8yXN68H6WjirrQmDA7dp8rkWSHtegQyLDvMHQ+7dTXq7to0nJOpF/lRDF4ChKXnlGEJP5UInqznDspfJmy6Ig/KECYYaDzTOx4jS4do3EYoKUVBALbr5nHXraJyTUaEj97NCkW8qNQ9XXw== 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 PAWPR08MB9688.eurprd08.prod.outlook.com (2603:10a6:102:2ea::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9073.27; Fri, 5 Sep 2025 06:44: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; Fri, 5 Sep 2025 06:44:37 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH v2 1/7] tests: fetch: add test case for gitsm implicit local paths Date: Fri, 5 Sep 2025 08:44:13 +0200 Message-ID: <20250905064419.2589111-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::8) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAWPR08MB9688:EE_ X-MS-Office365-Filtering-Correlation-Id: f7e7d744-f454-45ca-2108-08ddec47ad39 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: 9rd49rHYmVbQyurDEIKgpPWmflhP026lSlHzrpgQMH6BeZX+2jsAOlvmyD76BdKt2w0utoJtLfrD8IINIPXYPh64/sBb9rV71PQ+7cSXCtui6fjRpbu/KFH/qZ9aO7Qg00XVqEselkZSrwHIo8GVCXuH8+uTKue2avlHE7bjy5U6t39DvwRPQqxR33Hf2vFTTQH8g9lOuo6S4D7HUqtPi4HMstND+b67B/5B7hqgxG1j8snOrqgVnPnlXJQ/G2LIk0vtSQZPzQSqBqkvvbp47jMJ7lvDnWGXHH5P8tTT9hROBJuZLcraYDEK40mmZJNojS7ZRUpJVL71vQKq1aIFaT16HOTChsoNJ7M3oC2jZvcDqTMuzwE8om+zxDnNL9EMpPSdl7NoEAA51Q3hRC+3mhf4FZ5kQHS+7USuMD96C+atvcvO64Pe4fQeQCFHqwhn23pf2LmlJgs8c6H6nNe6Srum0VDhMAVnEBY1SJjCsoxRaBG8b6WxD+v72MGxtIuU/iCnKqAb7c6SCl7m0xs1R9apUZIXpjGoW4CFdi3FmtiDwIlRYnSXBWZNWpFMex00/yzQdAjSDwfyplNV/N82LjWlLq5ONqXZZsufJFKLUJg4V+Uro3w/qs2FVjxQDMI12OsjCWN7WOIeq/B0+uIxHskbwMymXVqHGtdkI7O/rWmdkQEsfZYhQFHn+KsNOe5yGuS7Q81isXDfS1wJQ9hvrrQXIxNuSHAdzRzgHBO9jomSGX6TcHKVmLsTq4198Xtd0W6SP4pcwiBcSRO14+qymVcupRuqd6/AjKY1FRc/EBlxcKTSpftbEKZ+bCY9H1iAk5Jx2gDHQkbjrFpT2q3L/BwaBHHxmjUAzl/RlpojLQ8p5dHwPxbq4RLE7WxwuYnV38dhWYZCGFB7ZK+5a/l9A4IRYVURCcPS0vXuyOLZpvbU/OIN8LZt9eu7NP7eBqhVut540t9DSBQeZz63LJmPKTZsYU10CzVkU9GxjHTnm3qtlVjDmRNHdruJaoTJvUsmzLDZuPrZ/1Cb5ybl0/cdhf22/O0x+5hrgE8xAlFm+CjCqo5uGmd+ePbez0nPaj7UjiTUshJ59B/w50gVp4hTuALp0QzEuvMIGsG/rDz7QRGivE6jg913J2TxOHIxaeQIRdaLHIrQa4Nxv505eJ7yFKhBEyC/BnY0sDs02ll1nw1hi+WpnMWEDW48n97LsuEQvK9j4ptgWujLw2izbAzL2k9qXHoumRhOYgpSjd4UaRKuUyHaFRb7TBBSCng2OhlQIbbGv39O/mVxDtNSTvne5ZaAhRB5Y+OAYbOy3O1KTqr0MmJwLqorNMTVSe/k/uU0QkljTUfjlCmaKK8jWKiTMH+2qnT9GF1k2z0w0EHv98aWnC23ayH9HYVxf3tTVeTPK+GuG1FckJBmZa9f2osv72YMElsQai+AKQZtbqiY3ZQB1dcOnwuhd739rYNTP1ttyk3yjwjC/Qu2D67SnjqNkw== 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)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0nxtS9tlMidMM4k5eWLnbF/O2Yi/wBnY+O9wQoKKpb9DbP8/pjsyfUKF5AVrFpraxa32ZcdkSbDr/pXiXNbh1k94tM+nIGPx8tjOdM3yljRo0qm2m3pcKw1y40B/EakxawGjqyhtzzO/iWX+ZPRAGyFXenilytWCR3Sq9yXraS07bKk/1qE4pdbjgYEpDXqcXf1Kd7ZFqz5BmgEtMQAmBUiVpqzsyHIywMMlghIBN5wr2Rksi/WWkcu587glSWTXHb3Y4cjNg0J6QZ2x9mxS7ACQcTMknwULSH0ltFLVoYu1Fe7AogjIRkzOoAImf2nRc/8fr/dulpXgz8rfxKekLLKki2HSFu5S7MLICFds2PCbEdQmWiJpfcJTfHz0V2Z7Mg5XPIiJiCDx9EZm09Xcc5TCHCrTZdCCGO6qt+npa+ICw2JvMmaUjHFyCnb2pVuLSqrazP597V3LsoBTbU1kZZOws7GqbOjR/WjCJGWuDooL1ltZmJvhWcgKIQzAPOcdpDGbJslJBrii8jOcJgYbW1VwvhhjF0KHGVrrTpOQoMel8EfJqZMcfKqQmgtO5mgyDQyqXR/cPOGUVaYEsp97735sJskYJez4/GoUWGelcICaSMQ8PMbz48FwjuDYk5JeBwKsdA6sXaUwmC0ZJBMj+cS9srlU3UNhgxxqd4pM2o8f9ZGuE64aOF9tCjWco9ICbTgcw5HKAQu/qQY7rQRLbWoEDeW6ELWP/V6e2NFv4Fe4LKNKRv97xOvIk37uQ3MbgkN0Ozb69PqFVouM6Q+wLIAFNQtRljJJ8YaESotDhn6GnO2kqoJrWv/dp3O10jMC/hhg2MiBt8pWHZ36AN/Iov6G4E7RaUyNyDPVqsGv3Cdrmhy7QjdEB2hxk0aPT+qKYN+DXGkS5YBqvchUrc4qHcRBQj+bPJ/AzpRiuMBqfYSsQlLsS42EmL7yC9MbkwEj8kXgWRLQiDE66fO6p/kh8iWkrAzj2n3XcO56IYknwDNI3U86SNcN4oarsftrUp0FucPRu9nzp/iJbr5HJnZTQNHbBO55j48iOyClfmsjySZoc/lMcfNScAsWB3/sXd9geYw6y6axdo/DtoVxatSF2VGUhjWYn8386g4WL2o86YYvVH4aPnsTpmHWXDurrjtSd4stjdKKwlbON+kRVuuhplZzuNf8awz2YtHFcpGSddYr8MHT45YZxSQllwR2bmkQtVgfhqsGmjy2AzuoYwpy2E7g6jnVDmfkiW6NWVcy/gm/zLqEhEu2zQBHxaQplE25MHzIFl3nAzZFmFYxmJH1xRArlNmtRUkdJ7kYuy1oCECSN/XSnz3QyQFXyYu2CH3c3HgtHjPQx7L6oTkbNw2JpLkrEQuZaIB8sC/OPjhvCGk6VH8LzImxoErdp7AqGE/+I0W/07iin96gtzLOemLHjFlCr6OEZuXaBwUeFZHSkeDnDflTzk8b4oOQkhcs47JZR8H2qiQrfzTCSiaWaPTOWyDLkwzMMQBmaFzhpcOzl0Dgp1hz1mCohMHjHsmORKpXvPmKzNeH08Yy3G8tsZBKk064XfOdQzazr+1nU3SUH3LLJi1BXg6RtFxgM6e/No152V6pitsIbe+1pETFI2GsYg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7e7d744-f454-45ca-2108-08ddec47ad39 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2025 06:44:35.2526 (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: p1J7jxfXzRKG8qjIiPc7EzsFiV77nsjO5IUq9Avpsqip0tyEo4KUCnDtSo6liiMMYHTSkyTQwKxriFeoXKi1KA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9688 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Sep 2025 06:44:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17973 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - Move test case for gitsm local paths into FetcherLocalTest class - Remove implicit urls from localpaths lib/bb/tests/fetch.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index dcbe60783..feaba235b 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -900,6 +900,21 @@ class FetcherLocalTest(FetcherTest): fetcher = bb.fetch2.Fetch(localpaths.keys(), self.d) self.assertEqual(fetcher.localpaths(), list(localpaths.values())) + def test_git_submodule_localpaths(self): + urls = [ + "gitsm://git.yoctoproject.org/git-submodule-test;protocol=https" + ";branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee" + ] + filenames = [ + "git.yoctoproject.org.git-submodule-test" + ] + fetcher = bb.fetch.Fetch(urls, self.d) + localpaths = fetcher.localpaths() + self.assertEqual(len(localpaths), len(filenames)) + for localpath, filename in zip(localpaths, filenames): + l = os.path.join(self.dldir, "git2", filename) + self.assertEqual(localpath, l) + class FetcherNoNetworkTest(FetcherTest): def setUp(self): super().setUp() From patchwork Fri Sep 5 06:44: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: 69726 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 E70B2CA1010 for ; Fri, 5 Sep 2025 06:44:44 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.127]) by mx.groups.io with SMTP id smtpd.web10.15209.1757054681032438910 for ; Thu, 04 Sep 2025 23:44:42 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=GrxfDHee; spf=pass (domain: weidmueller.com, ip: 52.101.72.127, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gNFs3LbXIbTEtzOlYXntMVhsw5sh5n549DCDRZV/k9bAJSAvBU6K6XgRE3jKmORQ/9P/jPuhEl56xeKCRsjZQXRQPNP7juZHat5BP9qx3O++9cP8cL2uKFwUrLObXH2uJehIBuRh4TCRSiDEQ1RQsCRnz7fLqL8yfehmF/o0UOVeK01KTlMscAIc8vjKTMFXQZa8BlZI/0vdfBK9WCNGXyWrxCJ8PXLZNg972Mo+/tn4zqGCjtCBASKO5we9q+blCb48l8guhYmW3paT4HLV8CA8MwdKeZ+pYfM1KEfAjdLVcpxoRMFIA8w/KAZlKfJizNSIySgBO5db3m3rZSpu+A== 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=aCRjfojtGtzYwfvx3Sdr8R6WssHXQiQZCN4oB17tPEs=; b=AOnJzWwVXPcmDQlB4dGAaf4fusadpXApQiR8G7l0vXUEEsHWEZ7IpDxTLggcGr6QPKYqXa+cIMpveWDVOAlOILZe70PiwVwE6Zr+2VxMp08ckpK+pm9HQUVUj2eH1CrCzyIXe7U0I0ek/Ev2J1fyBH6ZwT0rFE/FkScreKKb2C+QWd1b9KiO7p+CRT8lDXiDQ1rfuYWQh8ITIaPtt9F4+anK+T+xbojHtLqle3Dgpgg8xYcru0bIUAd4klmwDPaZO9cSiT2DJvUa8t5NPdNQspeTvKIqZv/7GvhMbTaVX4AEXQdaOXEy4vSGIvsOEgjy1oOkLB1EecsFVuHA2iGLBQ== 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=aCRjfojtGtzYwfvx3Sdr8R6WssHXQiQZCN4oB17tPEs=; b=GrxfDHeev0CMDzos9sQiCvf0evcvmNvFOTriMfKBhGWfhyuoLZD3ECeJdqLlTv693JWhsw80u9lBIheOFjZiPTDmmyDkoB6r9+sePiClqF+HDVcPQl8gjQjUEmfyUR2Cw/styEHMYupcQvsVJ8nRZcDwguzUW/djnEKCGEs32WjbFVKDXRl/yqTrjrBAbE/eVBxDgjcTTBB7QFi7ltbTYgP+jWnx1uZfqXeWPSkHWVrIxAPtlvYj1ebrFod4/dm7nVEJEMQ0A0EMm5Xmc5cyUT7Lv9Z4afFjC6YeVCzgzEEHoaiRsMQJGQI27MiyU/70K4fqhGXgdSzfMXojh9cyMQ== 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 PAWPR08MB9688.eurprd08.prod.outlook.com (2603:10a6:102:2ea::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9073.27; Fri, 5 Sep 2025 06:44: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; Fri, 5 Sep 2025 06:44:37 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH v2 2/7] tests: fetch: add test cases for expanded_urldata Date: Fri, 5 Sep 2025 08:44:14 +0200 Message-ID: <20250905064419.2589111-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::8) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAWPR08MB9688:EE_ X-MS-Office365-Filtering-Correlation-Id: e2642301-c2b6-4a9a-b0fa-08ddec47ad91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: 5a5Q74NNXTGDe+Fh2dtE+zHfYSMQrNKzfEhaAGI1nhfNrxsyO+nkLqjV42aw4ILfV2PhhWKEz7XOum0nIfe6jJLPg6IP9gVmhXuAT5qtTKjlvZskUsB1hbw65p4E8AMEanq+4ycMF5EpRc41YntSxy9queX9p3+Z/L+Ez5VTK7zYMzP/TRQAzUE9FTN1/+GbWAdo+TcmN14QtKgFhtVdtYZ4pgurD4qd273UmBUNEUsxh6/6zrz4GVT8p+emAlL7b7OznH5Wv4AV23Qg+f0rJs2J/aqG12UvlDECcVytAfjLAI43e6JBvvRIeGXBtJCgI6ZKSqynJap9eD14PiXmNM/XyJL1Y7S3gqE8rkcDIAyssRr32zF+hLIvpidDGe4fmT0j9s8OCN5J91cpLjMW9WJLdQG98Vh/t5h7CdhsoWsVBpVcKTcT8fS5p/OzZgkTItboFQGCyhoksLI/dfVz1P6TjqwKum7M+ILJE0lmoX5HmkDSSHmaXW40ZjKlGLlthJr0kuXWso2E/ny7+rsiWHRA+LEIgESJVuRpszukroTVc/qGvdVw+EwWaqHIqhX9OXdE2SpsAc51yHG8gH3k6HIahWcIjzHMR3gGPYm+EpPW2JNyI17F58ddNAMsoAMVJTZ5aKP8SDRO8tiup2Dn1KLvKcqI/4+9e1jXtrmcibDrBLkE2v1bXbFVb3jQ2DXG32Y4UTC8ZeR9gN3PLTqwVTcVVWh868rKOiDSUJVQlg/8HNf/6y+eLa/BUbXVoIlcJ0P1pfgBtRrqu3T/3icMzddsl9W3sPRkCpMZFHzYW1h4CpKnj4E2Nm5xODmwdDgIIBNt6kRz85jHnTFmm780xDEu0D55+YkAx74uxkiiBpa23vpUYGzInXmSUQFqIcqQfwgaPDOycbyxU6EtRVKqhnNYwU82Sdb8Yl2TJPq04W874y9ywA7I4MyZU71GG591phPRLiQSy35pZvfWrKVpnCPP3tP6JohNzLIE+7bmj2FfrRZ6zLahnTLweMoGHltTlSsRlRP6d7l8CfnX95MDG2lBkJCMtkCkhSD5Jo/hOFWpEQB2MXLXjynM0D0K8GKy/MxcSKQdI/1zzp7IS2B/ID76HbtaR3TE5IXu4+nRVM+SDIjalBQ1PglOg3SgS1dYKr8fUXJd4Z1KRLMyESjlvXoU3r7QnRu+qZ9exjxE7mpks90Qi3xW39Yxl13MpJ6sIho3DLoObdMGA+iEqRjmRGmXN35nlhk/1F3I+ISLmLCOFd1gnVWMbBLDjms0CLetKwjabKDoicE+qPVNObKbjjKf0xAd0PKmzSiYAESSgalAxaRGWSPK/VyXAT/ZzPBAag92jgzDqszzD7Dy/ZvQ6aFVv507uebDnXXFBKiKJqQZsaterpspifN7qP1lF95Tdbyw+Qob5bUdCw4Z/1oEErwHfmbgDrJj+V47fzInvag= 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)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a4ggajOFoVGLRhmk7WgRnau2Yi1Qt4TGV3TzGF6co2bQmip11H7hz89XBGUq2aA1QGzaw4BhN319wapbncCtu3rKziIDQH7cmWKj72q4hYpTdUfcJefcp8TXR2DtPfhnIwiMkEWcNPXTFTIE0kN4VCs8mbeBhVTdEuDuPMrD8NHs4+RmcVML3coFxDhCfoHGFk8AaY694EqYlRwIMyEqaFgVlB6bMSlEbKtDclfEdCoh6iNpxIK9Q/1nfM4NF3nP0iNFHD0AaTxQeDjE99AWWBKl4AzI5FekWMSR5gq3HuQVp24U7m55CIswI30ECv/QiNoJWuPLjCGrmz17HHFpRZ54KO2Zj4Fm1ziZP9Sw6zZhOQmToFzCJ8BY8o0Iu5mAmPEJbSa/z8EUlXGo3ZclBw5MN83w84KQbK5NArxNTw9/j0TA6T2RU7fxA3s1KXKlsptFVDFjwb5XWAGhTycUbDXpgbRDwmUqFx/kCAOV1LwgjvNrM83+NTgcnpenHih8pG1kRj1kcTAHvI3miB3Oxhtz6yPXmKt1PB563TQgTZDcMPRr3R3EhiFc7SfRu1wDOMUl+HSl+mRMFX3zfWMgOCfi8xiToi7q1vnkLvE56jh+isTwEoqj6l8HGDfaq2fojH8cvni9R389pNmnKlfYFkJ0TugQVK5UmbgmHn0vGGwZRxrVoaHm/UxxoPz+8940pbS0UoRXGC3guZBRHex8snLOg1i8Uw7hSefH9aO+f7FIRWgOxGSg3ByZlEfhbaJRSa1xJP7UTOQ9+prc+kF80XFUMrChqpX2D/XnwnKrMl8floY1KIw81VYRkgpjE7Luv3eHzbjHVQubTmLg7u6B7KRve8rflx+S9Qy1ksX+nU98NJTZ/iAeMIzO7icshRtHZv1vRsZBPPtt15rCRhX+Ee7dJJ6CCqDX+f3O+BDOnm8eegsIjHXFiDz5xJq9iUZWjEnsWhGfgEtRKIKFthYA8OZZ4w8pnnEDwhtvxAf6sMNmmyxjR+EtEeeeijOXkBrMkv1T/gCywCYjkBwlMUrTMdlBUjdBZlD1DLC9erhpnTsAub+o/bi495lplh7Qir/Aue5oQQtaRzHWRahLVgpEw6FNkyzwpcVfQz5aKTpMtIcK1Xl3b1VxVF4cFu03yg14adORLPwQwsiycoFQ//VK/6omshkpS1+5mulQAeT5EiBtIUUNdvxpG69wSShc/mMmG6DVeYhsft8lm0jWB0Vdp8m2gP6t35zhOG4mSX/yCnRQEQ60j5AmurHOJ1MQHL1SN974SipIAWygV8s4uXm+UzZ/l7Nlh2MRpioGCkEFIsat/7nMKJKStf8aAsKaD3mIwkNN9bcJMfXREYtNY3iKTz0dxNfFyS3PVkvqFBjeVUYxpw6WEuVmK9dg52tufLS+q2RFHyXM0zeslq6Ix6ZFWSECsHqGsp8elmbrxZTz619lsy4hwtkF6Kenx++VRsvdwm7kNKv6BuZ0VAwuyM+OU8OyfKEHb84cyz8K3IdxX9h3xAjCMZJeR4sgJRIupfUZWpiZhCaBb3IxbMyI6bXE9UrHPUz1imX9o9fj9L/Kk09gOx5pnnILTGQEAPf92FiD7QtDXwv7568eaTtF3K/SWA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2642301-c2b6-4a9a-b0fa-08ddec47ad91 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2025 06:44:35.8503 (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: WlrgUfABU2s/EKJxMe7WLycaqUMD2Ajd5jLozO5aTOqAjiZ7B2cT1wWZH7tNzwjwAQnbe3dxV4gMvj7eFU/AlQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9688 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Sep 2025 06:44:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17974 From: Stefan Herbrechtsmeier Add test cases for the expanded_urldata function. The test cases contains plain tests for local, wget and git fetcher and an extended test for the gitsm fetcher. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - Add commit to test the expanded_urldata function lib/bb/tests/fetch.py | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index feaba235b..806870198 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -915,6 +915,20 @@ class FetcherLocalTest(FetcherTest): l = os.path.join(self.dldir, "git2", filename) self.assertEqual(localpath, l) + def test_expanded_urldata(self): + urls = [ + "file://archive.tar.gz", + "https://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", + "git://git.openembedded.org/bitbake;branch=master;protocol=https" + ";rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5" + ] + fetcher = bb.fetch.Fetch(urls, self.d) + urldata = fetcher.expanded_urldata() + + self.assertEqual(len(urldata), len(urls)) + for ud, url in zip(urldata, urls): + self.assertEqual(ud.url, url) + class FetcherNoNetworkTest(FetcherTest): def setUp(self): super().setUp() @@ -1316,6 +1330,36 @@ class FetcherNetworkTest(FetcherTest): with self.assertRaises(bb.fetch2.FetchError): fetcher.download() + @skipIfNoNetwork() + def test_git_submodule_expanded_urldata(self): + expected_urldata = [ + ( + "gitsm://git.yoctoproject.org/git-submodule-test;protocol=https" + ";branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee", + "a2885dd7d25380d23627e7544b7bbb55014b16ee" + ), ( + "gitsm://git.openembedded.org/bitbake;protocol=git", + "c39b99792547b642570ea5152070e7396e812390" + ), ( + "gitsm://git.yoctoproject.org/bitbake-gitsm-test1;protocol=git", + "120f4c731cdc4a24cd29e44c4c02c4c658d8bc0e" + ), ( + "gitsm://git.openembedded.org/bitbake;protocol=git", + "52a144a7daa94b2bd239d582cb71d1f03119918f" + ), ( + "gitsm://git.yoctoproject.org/bitbake-gitsm-test2;protocol=git", + "f66699ed76c2b21ebe2a94ee23450415d2c7dee4" + ) + ] + fetcher = bb.fetch.Fetch([expected_urldata[0][0]], self.d) + fetcher.download() + urldata = fetcher.expanded_urldata() + + self.assertEqual(len(urldata), len(expected_urldata)) + for ud, (url, rev) in zip(urldata, expected_urldata): + self.assertEqual(ud.url[:len(url)], url) + self.assertEqual(ud.revision, rev) + class SVNTest(FetcherTest): def skipIfNoSvn(): if not shutil.which("svn"): From patchwork Fri Sep 5 06:44:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69728 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 E625BCA1015 for ; Fri, 5 Sep 2025 06:44:44 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.127]) by mx.groups.io with SMTP id smtpd.web10.15209.1757054681032438910 for ; Thu, 04 Sep 2025 23:44:42 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=NMcGXiNL; spf=pass (domain: weidmueller.com, ip: 52.101.72.127, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IFg9Hpugzdq+7tVjz7+0u7U1PZo6IwjWO2wUobtHwUh+6mm8pv5/Y+NePoKPW76yY8dHY7Zl6M2/nc1fTbeuw2Sm4bhOQyTOzEGItULzpcVAY0waPOQPUuZAds/cfnZ2X9fdwcZhNvwNU3XvfT17vsbJoLN11q0qIsHuZBnj1kiYdFzjwuktwQRwIg76ZzHQJw7lFEZMqYpLwwj4H56uT4ZrjDwC779KBngasZ7nIZTAUqQDOEP/4Q8c7L001BbL/JiMVVbkc9ClmDFNUZIhgXLBG4/B++Nmm6Syg0+BQ9Mz1sMoMb7LVGWUMNAZDvZ8GrW2vFaUtwm21t1SJEa64g== 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=UjATs7rc4SvkhO8UwMhwlj9I+q4D3JdRpeWCSUkITu0=; b=HPtzOq+H1unn4Unh3NtLkbB616PMeODEHd6aeJzkznZ6mRCa43GYrHZqf+Tz2ZJmTkBW30QMJic01JAfSpcJmTcLKOOnodLq8gJhfV6X9Z4P/SphidumrrblVJHnm9BP3ErY2CXn2EubSui/+gXhPORVJbL0cqqkj9vP0KjlT2T9G5FjVItE6yC3d1wNT+D0ihK7Z2TmwL1JMbFqijFC960RXGTRi9aUWNP5h9QZ024MiIuTVYo6susgV1NYZinGECveoGMuYUpopXjkQzuQcGUpWw9bHxanlgEUv4pgFBLPWgswP3aPeV+eZz2Lyo5oZYLyndwsJYb36g8rwwy0jQ== 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=UjATs7rc4SvkhO8UwMhwlj9I+q4D3JdRpeWCSUkITu0=; b=NMcGXiNLYEYDOzUtngk7Q54p8zA8VpacIugbg/xVkvkaRuYIs/W14q2dfksI4TZAtQpK5wsCQkKi2wGYoRvQ8+m6niuhzYNMRiMtf1f/58QMqBnpB6EMyk1m6U25p3wXB1yLq6b5pO3Xft3SxbsW6tjKwDJpQVdNU8UiUvDC5UT9RETXpDwAq2GNA0iWBp0BzY1RzRBP4sX/guWRt4//yB/9vbdV3sdbur027WevTtnHNFzaAZdoA7jWSZtPVp8GYKS5novIGiqAL8kmfi6aq+E/waKw/zCTO9qABLACwXEBinAbGbM3W26x2CTshoyYbqc5aY6U9uswfmHhqoWdXw== 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 PAWPR08MB9688.eurprd08.prod.outlook.com (2603:10a6:102:2ea::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9073.27; Fri, 5 Sep 2025 06:44: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; Fri, 5 Sep 2025 06:44:38 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH v2 3/7] fetch2: rename u to url in Fetch class Date: Fri, 5 Sep 2025 08:44:15 +0200 Message-ID: <20250905064419.2589111-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::8) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAWPR08MB9688:EE_ X-MS-Office365-Filtering-Correlation-Id: aa471943-7ebc-4c34-940e-08ddec47adeb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: U4RpIhuJ3eBA4OUrpVX6H2HRB1xwWUoKwiKqAOVu6KLJ9duZCwO4UiohJ/lwRKf+0R9zydQlQWp+jVGsdh3ySufuGBHNmPR8YJKwzwQJIjInVA0thKDB2hpR88xJ5Zvbk3JxV48Ouc5EOpeEMXHv+6889s8O471w55zfkqBu3Vg5AuLH0Uyz3G6ZXCbdWSCP6IUDhZMO61ovoykKP/L46rSF/eNU+kCFR8jwIybssJpvVTYqRPUHe1ADBFLlxh/LuMkT4AsbVoukLCIfEAtYvI8P4bWJ6SxlcD0HclbBf5/qyRhnkFBD9detB9+o0vhtVaktpu2Tbr48qD3cQ8iBrHFGtwd9DCjxOqqCFpk4C4MrEI3pQlbOFf0IFgWjN7Fs7fqajsBN2rN+dWDw2oF7JhIq8jxJhhuw1AxckRu0I0ESMv6sNAErnLM8oBtnytMkTitkIfpxVo/x4wQ/7DuV6GQd5E42zRuuEokup8NHPEan/YiuViGJ6r2loe1AjKgiARlVuMeGYVzylSjQKJ4pBZ2izYOutfzg0WNu0lz7e58GkbtnlZqbBGW5hqpd5s/crkBfCUJEn8ONC7h3eYKUEZFsaCQ6pCZsSuLyNv1bWAtoAfz4Sn2jfEwIoFcPec4+pcxG7WacC/gg58KCg20z3AGMvCF+mBYmN/ZyL0NXeqxmgmFBcP5dsCIQVAgiyWLnk4rvemLUjzbSd2FMqmyK45cwzqj2YBKAmBSjWB4X6p9Pyyj2YBuUqHZrKgPwDNDZ7sgTuRuIjX9/jkausfX7PxZpx4lwSmRAHNE8TySx6B/sTrIVYDxgphqVE7iY8I+yoncX/Z0Powo6sa0DhrJvjp9nVWzfo9a3Kj7ivr9evhtQPKzPSEFsw4bK2vsZyPRwb6OcteIRzAcbukbe3b1OZP2cb9t6Yj2OLT9MvlF2KqOIOR1N9ZSX/fSJ2h3SP6Vr1crDY7Q/swUTUmDhtLgF3MnUabmHgj8La5CdWODFuvPscK0hlOlbcZ20SGEP2SJDs15X90FyD1NeNjac4uNhDGooXf8Bi+V2ZRDjj1fsZUipBdSuRCYs61c5obu+yuTu8WfhWRrRzR6Gy2PGyO2V2vLLUOvwsPGIKfDfm8Fzf01AfiBcM/hQf6e67tgaMiaeckxZLmLEu3acvy4gV/ZtlJ1EOnMzvfrGIKffl3haZ1ICd4Q9DE2Hu0zm35NhZadQhpvXhN3rUU32+Ig6o7ZG6NAm9c6/B60fd6/Os8fztrYvC5Pkt1TdaDid20KNbqphoTkJ9ZukhKCjc6wJKGNETzbObaovKwzntcxE8UkXmPaIpAVvpxt8+nFP+v/JyPTqtN9jWB6x9SOOIcsdYsAtTRNL5ZTZacszYwgEe0Mmfk0knHo+kO+1ksxtBBwKLq9DTuS9Lq8aRt8t/kj7q6n2ngszcApsT5UId4h6EwPUk2/AhSbSbcbd7tg8kWEkUPm5kP9+Ao+KxwDyeYApiaBRXA== 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)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9/clZJlvb2C0QJ2bfUwCbzHC5ZOhYHvU/wuZbl7n8kEMsqr4cfQ12BLIU5kge4NuxQsUSfX79Vz71PUBh3BLiEjwFZNNE5Ha2Q5mY0hTBObYJlHfKLI659ZhAwzIgf3ufJd3aPYjm+KYRcNkmEJcv7STEqpCj2Zp6vV8SW/zPmehp2zUwJdDThsgF3dgq+1u/e/7fkhH8YkkuRV3NNdbhI9oCON8uvXO2j8s3kc8PwpJonrCww+mTVlt/oARxkg4OsQOpmWW1lLBGLzxRsa14m0VasVHh3mAtQV5q3GXLzftSY9HQDwK7pVlftp+bThpvud1YBoWui0TlQdsgswkl3IwLGsS+GJmKYiUxXcNu/bCF5mLq1BvIvEw9fL9KdQgaOxdhh5taQMSJb6FhNJG9qv8XOoSD/WDuFAGMmqzQASTv5+botqIyqu/IRxmSeG9uEwbpPnJdIMblhtsfHT7uu6XWeCZxvi49AolfAyg82cnpz04u3jf22WqzLDGIrz+JnuUNVoVBEptx1oghZ56fxgaZgyDbg02M1F43jfdZIx9gKU1PXm9GE0aSKPIYWh+nSwwGtyg3QWbbZOltB+u8XaznUrmvXSHv78K0BGbkaNAy50zX1d3aeO+lAxJwXl2/eNGp7GE6PPXVknEk0Wu1mKTSVMjiqPVQ4yyGBRpiUT+s3Uv7ufAbNwANbuipx9g9HiWCAGd2q0mDgF8VrQu4GJ4H/itrg/yFJ7M8ng/Wy142BeOKKml8LooiDZF18KpMSOcSmMFrINRferY3EMilyHsTZNgwSCyeciQOysf6ElXbrb/QDVJaQ92UWD9ecQQJdXHqavMYQNdRW8mpYv2Tujbfb00c3Z1cyg78Tjiw/BmmJQbeqIktVzV4F2vo57zBk/DEj8o33SHnCZ+vi3TIuRVUq6gafYaf/5TsNUuI9+E3Lp09U1n/+94zKhyq5FuExijNMwwnTzNo9WHFsT6HF8R0rN9xN5PAHRLNqTJRvZ6WFwVraGeWmkqyG5xk0lO8rdhLEvO0dbTAb9o2lIAf3bl95ohQrJHroFVUFU37ar0VIIyocIc9udPiu80zzDQgZmhsRPa+lQFJTeOQ/klsdNJBZcBABi7r/EyYDstf6mak/QYXkcN5zpkiYzZuV8BwPMdp2DJTH4MpB5c5yPlj2SMKVvAMsN0dBBXWWgxHjMUl+z8ADt9xGcvjKZaFZlg20e5cX9IOu/3IG083iJ1kYqw8ssonh55RjcJzBA91Ha/S9tXai1emYHXUcib3Oeyr04J38v0FTeo1r54emyNkG+/8mWi8MSyrglz2IUWkUJcGLTcJtKQOoJoF3VWR5nDwR9WAHcHIXBCAaaYmWOM0YRuvVdBTjBbTzekdDCkEa65zlbI7t/uavOR4bO7pXX/8EILeLmeXTsFWNlzUNIG3lb5jpcxWdk9PLT8XXZluweC1fF/I7Cea3oW8FfdWSMkkhD86o7r58x4WfTUO/a5qjBnK7Os2/tx/ynQ0uzaNeb1+ZTrbXB8vtZwcMJqNnX0AgUjQWjM2UI8QOoNkqdQYM+GsJwJrZcQ4ZFZHF8Ml4iQNc6Pgs1GlRfStYXnzLjBooNgx0JTWlpZfMoGC9Fe7A== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa471943-7ebc-4c34-940e-08ddec47adeb X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2025 06:44:36.5369 (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: a9UjlO8dEhrLoeHIRwAQ9RdQphqZkXn1P/H+JaKDhgdr/dv4vkjv6ruSYDeQ8B9LtlBm4OEob9gxqnwtD5BUiw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9688 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Sep 2025 06:44:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17975 From: Stefan Herbrechtsmeier Rename the varialbe u to url in the Fetch class to clarify its meaning. Avoid using short variable names over long ranges and simplify subsequent changes. Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) lib/bb/fetch2/__init__.py | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index de301543a..bc9808da1 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1841,8 +1841,8 @@ class Fetch(object): """ local = [] - for u in self.urls: - ud = self.ud[u] + for url in self.urls: + ud = self.ud[url] ud.setup_localpath(self.d) local.append(ud.localpath) @@ -1859,8 +1859,8 @@ class Fetch(object): premirroronly = bb.utils.to_boolean(self.d.getVar("BB_FETCH_PREMIRRORONLY")) checksum_missing_messages = [] - for u in urls: - ud = self.ud[u] + for url in urls: + ud = self.ud[url] ud.setup_localpath(self.d) m = ud.method done = False @@ -1882,7 +1882,7 @@ class Fetch(object): # contents mismatch the fetcher can still try upstream and mirrors m.update_donestamp(ud, self.d) except ChecksumError as e: - logger.warning("Checksum failure encountered with premirror download of %s - will attempt other sources." % u) + logger.warning("Checksum failure encountered with premirror download of %s - will attempt other sources." % url) logger.debug(str(e)) done = False @@ -1914,14 +1914,14 @@ class Fetch(object): except BBFetchException as e: if isinstance(e, ChecksumError): - logger.warning("Checksum failure encountered with download of %s - will attempt other sources if available" % u) + logger.warning("Checksum failure encountered with download of %s - will attempt other sources if available" % url) logger.debug(str(e)) if os.path.exists(ud.localpath): rename_bad_checksum(ud, e.checksum) elif isinstance(e, NoChecksumError): raise else: - logger.warning('Failed to fetch URL %s, attempting MIRRORS if available' % u) + logger.warning('Failed to fetch URL %s, attempting MIRRORS if available' % url) logger.debug(str(e)) firsterr = e # Remove any incomplete fetch @@ -1934,13 +1934,13 @@ class Fetch(object): if not done or not m.done(ud, d): if firsterr: logger.error(str(firsterr)) - raise FetchError("Unable to fetch URL from any source.", u) + raise FetchError("Unable to fetch URL from any source.", url) m.update_donestamp(ud, d) except IOError as e: if e.errno in [errno.ESTALE]: - logger.error("Stale Error Observed %s." % u) + logger.error("Stale Error Observed %s." % url) raise ChecksumError("Stale Error Detected") except BBFetchException as e: @@ -1949,7 +1949,7 @@ class Fetch(object): checksum_missing_messages.append(message) continue elif isinstance(e, ChecksumError): - logger.error("Checksum failure fetching %s" % u) + logger.error("Checksum failure fetching %s" % url) raise finally: @@ -1971,24 +1971,24 @@ class Fetch(object): if not urls: urls = self.urls - for u in urls: - ud = self.ud[u] + for url in urls: + ud = self.ud[url] ud.setup_localpath(self.d) m = ud.method - logger.debug("Testing URL %s", u) - # First try checking uri, u, from PREMIRRORS + logger.debug("Testing URL %s", url) + # First try checking uri, url, from PREMIRRORS mirrors = mirror_from_string(self.d.getVar('PREMIRRORS')) ret = m.try_mirrors(self, ud, self.d, mirrors, True) if not ret: - # Next try checking from the original uri, u + # Next try checking from the original uri, url ret = m.checkstatus(self, ud, self.d) if not ret: - # Finally, try checking uri, u, from MIRRORS + # Finally, try checking uri, url, from MIRRORS mirrors = mirror_from_string(self.d.getVar('MIRRORS')) ret = m.try_mirrors(self, ud, self.d, mirrors, True) if not ret: - raise FetchError("URL doesn't work", u) + raise FetchError("URL doesn't work", url) def unpack(self, root, urls=None): """ @@ -2000,16 +2000,16 @@ class Fetch(object): unpack_tracer.start(root, self.ud, self.d) - for u in urls: - ud = self.ud[u] + for url in urls: + ud = self.ud[url] ud.setup_localpath(self.d) if ud.lockfile: lf = bb.utils.lockfile(ud.lockfile) - unpack_tracer.start_url(u) + unpack_tracer.start_url(url) ud.method.unpack(ud, root, self.d) - unpack_tracer.finish_url(u) + unpack_tracer.finish_url(url) if ud.lockfile: bb.utils.unlockfile(lf) From patchwork Fri Sep 5 06:44:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69727 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 01A8BCA101C for ; Fri, 5 Sep 2025 06:44:45 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.127]) by mx.groups.io with SMTP id smtpd.web10.15209.1757054681032438910 for ; Thu, 04 Sep 2025 23:44: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=t4drvTaQ; spf=pass (domain: weidmueller.com, ip: 52.101.72.127, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Nv4aos1mZhOw+qP+uM6OooaCetZ1hE89jNoPJ0TJZugs1+HaUQhtRvrCOIe1LFWRLh0991B5HLFBNFw2BuaKG+nG660olcgI+1JZvx5QjjEeNWhIp6UBOBY7lU4JurmkHoIq7guPf7YrKwdTOrdak915JLur12mpuvOn6wDnkz+qcJI7n/c3oxNJujBDh5J/JFWN/CX/X2FdEAmD3xSw+YrQLFJWzIVfDMLbcwDWJL76f8Jm2KzTiL7Sktv41k3SZZqQ+jB56KNR+i3MX1awf0etTS9HNZxkFWfiYREbVx4Pxb/sI76Rupy6MTPzCHYomIRpWTGcQcMCQPBAWXVd/g== 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=+vbNY4nNhco85/WzZaaoorMppU41en3nvEJEfqFy8WI=; b=nwVi1NuEMGkX5OrYs5WBydwvwNN8NXRY/kWPxK0sALRG0e8eHm/d6BnGFPxyaOFIWQT31Utc4FeCOPDDe+m3cFoAyXssWZ/DpMJJGW45MhKnips29pkxOsYzqNVGx1qLUD9ieTtFJmqquwgKt+p1fcx16xcdHROlZDp76CeZf6FBMnC3MEKg7w9bCV3vLcvLDL37zBdkf/BR6EBo8sV+SsDw44OoEFIAxa9AuaDXEbFs1Da8nuXyOq/0grPHGDy8lzwS5MjtzGKcH1ucw9GebPPhOOt9NNfQEYgIpAqdZD+B/H7yWeooEmAgTW2XLQVQY4sieXK8U7UbFSTOkdU+hQ== 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=+vbNY4nNhco85/WzZaaoorMppU41en3nvEJEfqFy8WI=; b=t4drvTaQNYHb3EHrdxy79og4ZSxjmuOy7bzh2UKcneDaPi7u0BFeLhNG7EuzmakgMvD+KL2Ac+iyFB0gfg8oVXojiQ2aEz54EG7LIcVHbFql7bvOlw9o8pURd8PcAPOmn1TPyu0Xr+HW2tkUzHlLuFhRez+zinYnvBc1XoLwCFYg7JyIa1Ke4TsZ9Zio9EESOCvP/d4ZpxgtpwDUtbwAsycybdwWXYtC95fhUlmF2SeJycN5eUF2IKYQAn6aF1UFSDqYvhO1fKBQyEWrUmelWTNWn6OsaatdfD2wDvkNooC9P+zzFOkSOwOeZgZv7bak8twVndSY9iB/uDJ0Hevr7w== 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 PAWPR08MB9688.eurprd08.prod.outlook.com (2603:10a6:102:2ea::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9073.27; Fri, 5 Sep 2025 06:44: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; Fri, 5 Sep 2025 06:44:38 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH v2 4/7] fetch2: call functions within loops of Fetch class Date: Fri, 5 Sep 2025 08:44:16 +0200 Message-ID: <20250905064419.2589111-5-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::8) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAWPR08MB9688:EE_ X-MS-Office365-Filtering-Correlation-Id: d952952f-3629-48c8-9d98-08ddec47ae54 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: 56acAshlVuADjqUUth82ZaJ1o0NXsH7P1So3Banli0llYyGMKJMmvRsS1eZwi/kCKQ4GlpLYpvxfov8Aw/LRAEM6MjcPIW2z99nQtH11JACGPgn7vnOi7DXUnbd/QFVjs700YTSYyJ34mH1+FEwbS1rYPsu5wdYVZItR9jm2I0MSY/bvgLtqxHuuunIzNX5gmskkjdohEXfGHDi6xcQOuRR2e6FIM2a54Bce/mJEtWanAAH8yLO8YBQLmlakXx/AbNPy7xiwRQ+gODaaFGd+JgSq0HYQuDq8s1fpiq7JuvAU+VY2SFn6Rcru0UUNNmpDV+F3Szqllmb7Cmwrco93EWiF8oWWtRIeM+jbnWuxm456vrVbpMdSbHQEIggZiznyw61P7SjqcmEJa0fwWR+b6nZd+THCmJWLTPlCe8BpAmIhdlhLkaD5z+P8p19T6S6Uct0bYX5poJx6UXJVJVShbvdTlbBsbXu11hlvIadrZRaNFbE3KOoeSq96tL2V1WKkMoj9yURALuMAviXXywrMpaBcJKv2xKyRexxEjoBppclE1en9X8eZ5qeFc5XBTrrMN7N0e63tLqAK8dohr2Qo/hYU0LBAJyF+i7wkRBNGyFskMWECimrX/mCxt7QIHZ7NjvAq5lmqJ3gk4h4dD/rA0QlPb8CWRWG3YhIdksXJJ9ve1dEFrmpD8lzIIRXcld1S4QWpnISbpwkSXCdnVRx6UZEKwgVNzxkwidNBaxcI2fK4p3H4LgKz0x98gFuqfeWeSkX54WVvf5eYNSvUQAN9ID5BPxqjPhQZOp2ZS3OuNh+nUw3MFqTFPsd/BrLWi1pXz6VZPygEyJ3wgDAncGt3/Cbz6wqfS4h5yUkGc+3TvibzbBJ4NVb1fQS+0uZShx2AfsXMaFSBlf9mLw6Oehee9vb3fhMYEvjZ/52jTRpKFgYReft6ew8JU4wHEactwwvDKE1n21MlcsBK69Wh3riuRajuYLO5JGUqXuikV8gVfTMqhC1dzvihlHvpSpqvIFJrVy0ZhdBV+8TAK304E9gdmQeW8JtGwHQz6zM67ZQB2COfilvlwITmyGl17MUtpR5MidsBVM7t9h2TmO1pdLi0inaehq2iiuth26ubJzkZXZfD1A2WdAZ1xKVGkvorzw9X8DBW+GUO7uPyt/U2y8vM0gJOdv2GhheYFwIRlFm5Wa2wDgGodliXKlsGsJ0EzVFvsZCGLEiCOQeR92bsbnzWD0Cy+IiSqr10RDnMlu+EnDAW4VD6U39aozOsdCqaM4FFF7XW/SBbuLk1h45j6eRF96iO7Xp5o+97XZ7oJzwwuoavW7kt+uTcH/GaFNAo2Cuqp/3mfyt1BkUJYIqb3b6njoN3dZG9garis+DlaLKpQdAokipnAoZgBLkASSfqzd85g8zEcHrFQIbf0FvFsisCnWhQdQc5U68X6mf6kXrJpTxD28RGvdjFFfFEu6ypK1g4jgY8xz2CNgPvt4AW2pEU2Q== 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)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0K9WNmiZbDx/yEg1rUYVL+8taXU7GJRH2zffSm7kyKnEqoivU81xRg7Lu5iIw4lhjHtqL5iYlqQolHNSUtVphNnQJLjx08nORbFpsbTKnkD9Igus1xQcXCqdp2IfqGZY0iNpW0OekeHTdouBEwtEpD43Ab46CeblsGRYBtONKEJ2KWvJ9oF70pdJ0JQaW6O9rVcRFiGG6m+m4r+EAg8ukH1w8/Vs+2HjC8RriOv/IRMFArKcx+9bTNjFoVUnWAj9eElLFcSdBjXUO4r3HvVfjei7mG7Q+zbeOPgoXK8kRYtHdRDdEvKpdwptLjFmALPpBFEpWiec51xDWBqPbo5JOBVVBqp0L64BZsJtXhSt5thBgu5NF2ITyL085E2PqC5YLVyv1+1NtW73iJvIFh/mttpV6FtdGuJKa742mJvQbbXqITXxgk5O0BhaKBFZCyr1PJ2q/1TcY4bT2urylQrqgnDNwQ4nNz8f2eYNXqXQK74KVqOyl7lt+a8N+b5SRD6N9RLYT64wxK7CNNHzOJSDyVpKp6BkECIVNFmwVXIJCo6wWUtFo6O5phoyZ5kFTfz5ZvwTPX9C1vcmNDNVzIGxZJJBUJjvJyEZmqqg13urqSuesVWl34+tukAXHJXGKKFwo0KJrmYgOQjsEIAj/0evYyoi5knglJWF0z0SOlK4QY5s1jUNl+eEfvcCXnQNAkfMXuUo3qjRsCR22QnxxT/xrVXoFNuGH/30EKjEyZVEoV0eD2hMLjrh0x62x2cYcD9IKTjvxk+nS/28GoIhiZ3cLMMRPTgNQU/sb0qBprVOpKVWJNzkkv3ICAFI0ujuEaOSynL7ekSpglC30H55HE4awEAISnmDLSf+34oQrcgD9rMuYP8NupeRDK5tqSJbkYr14bRM7ouBg/0/ZSGoGbmSzQOLg0D0LDwOMOXZ+3zNowKTPIxhFrQKC9PpBLGCRrkWGWiG/9GQjj6x+WHTCofk5XFu3Qrb69iHOFr8QqU85sga9zC8SpVTIuugBPTVDSq1mPXCZtZf0XfXgGG7Hj8fFdkeyQ4eyAWyDmWq64pjBDgSLuWrsXbvrUcxk3szOZCKGw8PLkvlgKyb6GbaLzh8Md+Iajgd4/b5vcVoCP6X3vQYkRqAN07dH06kUYSlW3nbEegXx4EbwOWOx5HiShjDAIT/PicbVf33ansGLOypxah2djUv3ej4Zj00aByhcm6cOQlFxmXYaHnPSsMoH2mUA3+ZcP6teu/4wJM/oLDzxM3KJfYEPaB3XdtJQ+ORlVUPXJdhcjOU44AMpflOIuD14rSmRoKQimVQi1JsCNJ6RKke1P83nQXtiX3ojnue0/aUu550oLaYgCxk6lVPD6WUN5lJzP4KFqyaxJh6bBbplnUoJIYGHn+TOaz4fLIebiIrjEoPCz5pu/tMUUrj3EHpcOXYJNR/2OvYEzWcIFePln1O6phq5XCJuip7bLQqVrXmhVOUbO+rfUGT62fLTL94iLGCD6ebv2Vfs1/oRPxjIzt+/lUL2kTpQKxZrlprcYIrRErWyJD6ilPgfZ9Dy3LNSW7wMAVi6H9YhkP3ui0CpA+E2sCrQvVpOpoac67mF5bNVJa2THVmW1dO+sO97dgoYA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: d952952f-3629-48c8-9d98-08ddec47ae54 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2025 06:44:36.9739 (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: NIPTgl0SY6VPU0jy4W/1yIEfJpKuepy962q0LInRy/Fj6+xk5KbnnaRSjwVxiwwsYONVL7G7VXfYrBQLK9tt8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9688 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Sep 2025 06:44:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17977 From: Stefan Herbrechtsmeier Call functions within the for all URLs loops of the Fetch class to simplify subsequent changes. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - Fix UnboundLocalError of urldata in expand_urldata function lib/bb/fetch2/__init__.py | 43 ++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index bc9808da1..3ff08f817 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1841,11 +1841,14 @@ class Fetch(object): """ local = [] - for url in self.urls: + def localpath(url): ud = self.ud[url] ud.setup_localpath(self.d) local.append(ud.localpath) + for url in self.urls: + localpath(url) + return local def download(self, urls=None): @@ -1859,7 +1862,7 @@ class Fetch(object): premirroronly = bb.utils.to_boolean(self.d.getVar("BB_FETCH_PREMIRRORONLY")) checksum_missing_messages = [] - for url in urls: + def download(url): ud = self.ud[url] ud.setup_localpath(self.d) m = ud.method @@ -1947,14 +1950,18 @@ class Fetch(object): if isinstance(e, NoChecksumError): (message, _) = e.args checksum_missing_messages.append(message) - continue - elif isinstance(e, ChecksumError): - logger.error("Checksum failure fetching %s" % url) - raise + else: + if isinstance(e, ChecksumError): + logger.error("Checksum failure fetching %s" % url) + raise finally: if ud.lockfile: bb.utils.unlockfile(lf) + + for url in urls: + download(url) + if checksum_missing_messages: logger.error("Missing SRC_URI checksum, please add those to the recipe: \n%s", "\n".join(checksum_missing_messages)) raise BBFetchException("There was some missing checksums in the recipe") @@ -1971,7 +1978,7 @@ class Fetch(object): if not urls: urls = self.urls - for url in urls: + def checkstatus(url): ud = self.ud[url] ud.setup_localpath(self.d) m = ud.method @@ -1990,6 +1997,9 @@ class Fetch(object): if not ret: raise FetchError("URL doesn't work", url) + for url in urls: + checkstatus(url) + def unpack(self, root, urls=None): """ Unpack urls to root @@ -2000,7 +2010,7 @@ class Fetch(object): unpack_tracer.start(root, self.ud, self.d) - for url in urls: + def unpack(url): ud = self.ud[url] ud.setup_localpath(self.d) @@ -2014,6 +2024,9 @@ class Fetch(object): if ud.lockfile: bb.utils.unlockfile(lf) + for url in urls: + unpack(url) + unpack_tracer.complete() def clean(self, urls=None): @@ -2024,14 +2037,14 @@ class Fetch(object): if not urls: urls = self.urls - for url in urls: + def clean(url): if url not in self.ud: self.ud[url] = FetchData(url, self.d) ud = self.ud[url] ud.setup_localpath(self.d) if not ud.localfile and ud.localpath is None: - continue + return if ud.lockfile: lf = bb.utils.lockfile(ud.lockfile) @@ -2043,6 +2056,9 @@ class Fetch(object): if ud.lockfile: bb.utils.unlockfile(lf) + for url in urls: + clean(url) + def expanded_urldata(self, urls=None): """ Get an expanded list of FetchData objects covering both the given @@ -2054,10 +2070,13 @@ class Fetch(object): urls = self.urls urldata = [] - for url in urls: + def expand_urldata(url): ud = self.ud[url] urldata.append(ud) - urldata += ud.method.implicit_urldata(ud, self.d) + urldata.extend(ud.method.implicit_urldata(ud, self.d)) + + for url in urls: + expand_urldata(url) return urldata From patchwork Fri Sep 5 06:44:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69729 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 0A7A0CAC580 for ; Fri, 5 Sep 2025 06:44:45 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.84.128]) by mx.groups.io with SMTP id smtpd.web10.15210.1757054683279460090 for ; Thu, 04 Sep 2025 23:44: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=yw0Tzs00; spf=pass (domain: weidmueller.com, ip: 52.101.84.128, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jL05VjUhY34erKh7V/TV4OhZsvQauP7EDF1hR8zUPv2wKSGqoGoHV5Bps+6ASE2nxwhjPqjwt5kf/KOvqDdaZUgkDPFC52B2sGeX/+4D5SgXTINGUD9ZwBU3x7lANs7+ebkm1YMSXOgqptIylCcy9TqHN/3nJjq8MA0IUicyT6N7VZHgT/PuFQBN/83Iw6d33dLS4XHqUAqN0uCIOgQ/RYAmylnO0J9Y6Gqr0OsktbXrq+5MqGbu2IqC0fkCfp11olcm+/714/dYZd1vafQIMQ05k1uEuH+SjGEqmTv/sIELADN5/LxEULQMgRiBqQOz2Xj279c5WDzl/QgqGk5w+Q== 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=ZJ3ZRvNfeqJ2KurW15t+l4Q/7a243ILJWk6vHWJxYgg=; b=QA9XC2OnMO5IhzYGA76llr8hshJHZsaLvi7mr1AiFNeOBhaAShXTGrAw6O36p6HV/BMHOUrFQ4nI6mRm3cZHfYrQBejOB5l3IvQhy+ULbXr4CNCWmDzb4JcpGH8khGjuG8GRDMwsaX/SvO01r7t8DQfPGouY48kVVZWSIwOlTtnRwTUx+ef8i1IdOrB66pgNUKDjdHPSE62DeRhABVXDWWupjbPTwnDrMZWU3j4PNqHwZRESDeFiWCoxUenbD+zrlWAdyeG03P7m0w8StHQQnNYgC3aTwajaK9ydMlgXFhy408ys9s6I3KQuDeNrttPG2t9IgpcMlNdl0xM8gd9iWQ== 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=ZJ3ZRvNfeqJ2KurW15t+l4Q/7a243ILJWk6vHWJxYgg=; b=yw0Tzs00a8Tyy0Z3NJ1L66aCVPkFAIXMRUnGqNbi4wK4OCMsWfJMYtuTMBHry8Bm2RSehQrGz5ygJBBmk4urWWhwBjRUEQmVeyV0anNY1zEplYL80ODtp9rljcZAbTuRquwZU1ualOdSYYtr1eaujS9kQbVFA0zcrJ5vp3UgKFB0aQWD5Zaf1yLDdk9THMepNu+fTpy6NDfArSk3tQroDvaV6Ro5ToGd8VTJsv983BXeLtYJoViG2fStZYqWNUoSmyMK+TOCwgaa08Kq966Vkv3YjQPZE/9O2F8p5E1+Zf/17zmjK3X4z3pYIXSIOygu7bZNBGlGu9efHh7FC2cI7A== 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 PAWPR08MB9688.eurprd08.prod.outlook.com (2603:10a6:102:2ea::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9073.27; Fri, 5 Sep 2025 06:44: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; Fri, 5 Sep 2025 06:44:39 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH v2 5/7] fetch2: add helper to get urldata in Fetch class Date: Fri, 5 Sep 2025 08:44:17 +0200 Message-ID: <20250905064419.2589111-6-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::8) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAWPR08MB9688:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c91eaca-8308-44d0-7ad7-08ddec47ae97 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: w60X6NxMazFvHDs8lGMhC7GVgEPIrgUprMEcQPLh+02kdnaI6ovfEVP2q2uez88LjAgfbxv42p6ZBcCoG9AK/MEtvrZlLWQewDvjavvOzkCQF0vy1UGn0qnoEmb8yXgZIMSMFFM1m/nt1gmEvkjzzM8TdiINjbzE/s+jlWMdC+Ak1DAFm2RkLXHTsOBUOd4F6OV3hEed5Hob07V6j3F/sVeu1ubUfm/Q/3zfounxJV+3CUQ/8THsRo7jjc+YUEyA9VoARf9pA4iISnWsyjtaDxq486YL6Z7Jp7hdh6lfEUx+rSMuqpSVpO5KwqOMFxHhGAbMxAU8P6ocoLXId7sLK5gKcq5fn6aj2QoaoSTJ28u5DwHyKNmf6APwG2R5KO7FodsRQOa5vO1nlGhUhfJ5UEn2w0V93bOHBftPL/2swHkB9o/eVjQUVGeEmMPVdLV1WRUrxWEFHyDFUO97dEEQWEmbgkm9EYY68/ykS/RnO30CDWOqVW150MQ/gj+hqy9umTo2KHAU2lW9esCOyk1dX2AgWNtxMw/JCicnUepsc7Vsy8IBM6yODy13NNQ3rkuv0TE6kFm84UYiodOjIrmHhLVJwk7KviSUvpR7oYVuRZz97buq3LVPzL8Jh+aPo0CDyKOhtI59rBvqU/hO3GTDwx8uZrUUHngmXGLP/ejf1Hei4LFk2FxpJfjGr2ux6o2L5xe2DzOYppK1A7mqH2Zih9+8qmqmRRm6nkZCoMO3C1Fk/0YWjRjywMyPF8xSC5MlLt9rIg/aDbeFZNE1vmimyMOFG0CLwIqIMQQ1JU8odX9SQ3E1UpplF5wX6VzHwIy8wPOnWQPRJSKGqbltuUPa1CdHKHez/NlfIsmdKyZxNLdt/nge5X5bFF9uS20Q7IN68OMYTQDUFljuPSG1piRTtLqla75/YnjEXJLObPkjVIsGf3uk7eQGFim6tHXe1ailZiHy+yLBUx0oP60mAajzFBO8EhWh3rDIdkVcXIzKOIgnmHP4IcQObKiXkglJQ4H12Cp5TS/InpRADVZdtwK6WkR4GeFm6TJo7KAD3F1Ls4Ct0N0r+EkZGJmscWtEl+ucJ/DS7l1HJybA+URq/nG15038kmic9yuIaXoY1aIF1G9tVxUtYmRWpow6byW5NMryfPf05S4PzdV0JLCJebn19ofWpOk4goeb1yBwiFjtFyJAMnUWVPyd6niBmN9sqqnYU6D+k6MmTuCj9v8kHmf7b5OgBIn/VyKM/4a6Q6nxQAt8sKXtSPxpFnu/n6lIQeXKcOVn7nIeNU5wtGwqOcdG/qDKzndN1ri4P94IpJ8g6wVX0ZxBosTo3xJDnGuLZsESJilYy+odip8dXy5ZDOERHe5pHG5Pi+9IT7/QErm+zunpo/WKkjbwiK9E8Pq0rj9MXn9pmhQjUH7RoOOaBu0a7ywgIzZQ59tXdqPYWU1Mtkm1qrhfDzxaVUMPzEriMzTK5Wk4ERGvqfp+ZBDdHxT2Dg== 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)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uhCilHqfpAaquEXR9n98rn3SD7tCCNfCfNxvIcvqO8rJkJCNT++bfoZp2cAfnMEkydCMnf1C843Zc1LiUIrNq7J0KXAzUCNlN4E6h9IkqDaHyfF3nYANhH7o/3yYz1hPtxtFb1pOFxE4Mh4nFrYE2wXMFCRzsiWSudM2DLygXlJ11Qy4edAtbBRbJFNi2jsWEd/aJRNpvjJB13AIJYk7o/hfBoFwKCNOpK/8IBnmZVvAc6er/abDox4yTojdOlkph+Kk/UtXSQE+J4QhzYmCmzwaXy998RgSq+lRu1nnCY41SEoFYSHGNGm2TmwOlXNkKWIBkKr0lFZNTyTMngqUmoopCTvQLBI1tx2cYqOJ7ODuowT6fYX1zMYOpW264eeoicy0xhyNrFMjIhXKLgusBGvu58MZ72GOSAm9AOYeUpqy8zCJF69LvnXc2hGo5BtkEZzh9iCcKXb25Hn2z3xYxJZvv1yelYJWB7FTqTd/R3MvCxRmRCDcplFkyjozFKL5LdS9w+lZQO2PnKFQ5uJgX9TD+TVQys9RHUHjk1Awrc05sq/ivqDZe6Ig4tu2/ldq5EM66VDoLx2tMAlTmeJkWpb7SKaNJcta/LRnbLysz7yisLNUiLVOXFU0Iv/GzW7PRTEYz0DmA+JxyjWI9LKGJYV0fWps9kqQSI1TlVjiFTvDrZXFtv0Z8o3QKkeqQXDT68LGOsbAkeb69j9ktPl7VzetXO+qQDts1iMYj3M8W4kOnSOaZvg0e1hOn0ORgIfa3k7L+W9juc13MjRDSKGv4wVUyKm0IwFR1+CeYgSETk3YWVfqIunxEq2LVuMsW9/aR/EVhR7xEDH1MHAl7p7Hxjnx96Ib/jnbUyntPt83AOt4FyS7uknBSd4RJC+1CgNoci8YA5ipU2mZTt7H+LayPelndOa5xMmj8Y9LQO8cYKB+QKRJdwf1VTG0KFPXwOZCFiSFQfuwYwvHc5/pFwEBqyBpzQMq8/vCdNijZJj24YCNK0HEhzYjuPphSh553UxwCf+B45BI5vevp4qjTEaWKVlRHZ5y4VqeUke2ypjVK8hxNX0Ypyc7Aq5s8qUmQcf5FU3ik9YzPSmLjmEakDaljxsGciyqQpPc4/rRw4WCOAawTxdAegAAraHvAWCQJHqY6SctPO2pjjXrN26jRNNSbN1N9zFvOKGdavcEvimVEGEQASyy3UzC2JSE6HL2NVHNIj72Sk1KSRjCEH02chi9yojUU7sfHuqRxDX+TMHUDtHmc5+VZOrJ37t5P0NDapSoZqisi8y6H9XbITp3VCx2pekyXcdrOVyqMJbB1ay6IXPNSTBbcslMkEGCEy7h/QJCGlYRtC86w/nYMEipqizrwOim2yqbHdWPSc/tCAg85AXqrZWpnP+YndbHNhrQU2XXrxXZBCGftMsJ9gHtRipaWFXfwbdyNgM9EPd6K+N/VB2hsx1koCP9/NlyaY+w3Zi+E3zq+tMBHKz13r2zLrrTphNfc+8UHAvZcsxoJ3EeeaNQ5mKXBtiZaGIYW0jvx4wAHLpj9JyBw6HpqlHaiirzeMZwqqcI5J2i+VAf82dMiReNEQnW49ZA4t++k+rAU5Jk+IiArk40w4Rqpv0s8LK66A== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c91eaca-8308-44d0-7ad7-08ddec47ae97 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2025 06:44:37.5170 (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: r+Gpfc0BsJjLHvQ7a/tRKKfxWJXAFK+6ngxRNcD3SHMav4eICxMMqnkd3muP3aJdQrbQiGADzpj+ZztqzzkPEA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9688 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Sep 2025 06:44:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17978 From: Stefan Herbrechtsmeier Add a private helper function to get the urldata object of a given URL. Create the urldate object if it doesn't exist inside the urldata object list of the fetch object. Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) lib/bb/fetch2/__init__.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 3ff08f817..c4d7cc033 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1829,11 +1829,9 @@ class Fetch(object): urldata_cache[key] = self.ud def localpath(self, url): - if url not in self.urls: - self.ud[url] = FetchData(url, self.d) - - self.ud[url].setup_localpath(self.d) - return self.ud[url].localpath + ud = self._get_urldata(url) + ud.setup_localpath(self.d) + return ud.localpath def localpaths(self): """ @@ -1842,7 +1840,7 @@ class Fetch(object): local = [] def localpath(url): - ud = self.ud[url] + ud = self._get_urldata(url) ud.setup_localpath(self.d) local.append(ud.localpath) @@ -1863,7 +1861,7 @@ class Fetch(object): checksum_missing_messages = [] def download(url): - ud = self.ud[url] + ud = self._get_urldata(url) ud.setup_localpath(self.d) m = ud.method done = False @@ -1979,7 +1977,7 @@ class Fetch(object): urls = self.urls def checkstatus(url): - ud = self.ud[url] + ud = self._get_urldata(url) ud.setup_localpath(self.d) m = ud.method logger.debug("Testing URL %s", url) @@ -2011,7 +2009,7 @@ class Fetch(object): unpack_tracer.start(root, self.ud, self.d) def unpack(url): - ud = self.ud[url] + ud = self._get_urldata(url) ud.setup_localpath(self.d) if ud.lockfile: @@ -2038,9 +2036,7 @@ class Fetch(object): urls = self.urls def clean(url): - if url not in self.ud: - self.ud[url] = FetchData(url, self.d) - ud = self.ud[url] + ud = self._get_urldata(url) ud.setup_localpath(self.d) if not ud.localfile and ud.localpath is None: @@ -2071,7 +2067,7 @@ class Fetch(object): urldata = [] def expand_urldata(url): - ud = self.ud[url] + ud = self._get_urldata(url) urldata.append(ud) urldata.extend(ud.method.implicit_urldata(ud, self.d)) @@ -2080,6 +2076,12 @@ class Fetch(object): return urldata + def _get_urldata(self, url): + if url not in self.ud: + self.ud[url] = FetchData(url, self.d) + self.ud[url].unpack_tracer = unpack_tracer + return self.ud[url] + class FetchConnectionCache(object): """ A class which represents an container for socket connections. From patchwork Fri Sep 5 06:44:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69730 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 10012CAC581 for ; Fri, 5 Sep 2025 06:44:45 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.127]) by mx.groups.io with SMTP id smtpd.web10.15209.1757054681032438910 for ; Thu, 04 Sep 2025 23:44: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=3miRvD+R; spf=pass (domain: weidmueller.com, ip: 52.101.72.127, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I873Odgq9wgzk0X2UYkqwYSWLUtRs79Dq4LvgyRvtgHv5UYSmvWTFwj3LSCti1sXWcDySzK5aur6mN2ACw1vtSeS8OUyPBAxwcoAgf176jrnlWPMYBPvothiVS4Lj4X2ytm52aVYco92k1obg7Hj6VYuhXtwHmG0thZc/ybkn28yQd+H++EoInRvGwhMb+kPMS1rgFaUlsxSL/Pii8KTwUoUfcm6bpE8MKA6EnSzYImAPhD2TjqOgrk9VcfzOPLOfm2ZMdtBi1LfmIhAnKg/05L0Llsgs94l2klxzEyTiIbFliSGhReDchDO4MoUuVK3BpfLukLX4ssWv1+2JjWJCQ== 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=JFXi9A25+K3N7kQ1ZNUVXkVLVkrxcrgM8fX2aYGEdiI=; b=zC50cnmoQYLy75PudEgbugXD9uXptmNAVwMVOwDZ4Cv3/oa0mMsbtesuAMEj+hgGzlxFbh9OYyll8YGPTGwxMQOSRW2SwMDiJois6i7ZAAJ4rTpvbwTjLAQzIn1ELFxCSjRVjH80/K07uZI0XPgn8AE8z2Cea8ottW7ULbI1OrQEt/OEscn/jaBN9ymtR/g45YffHsVa+1/eloUhHQ1NuVXd/3zw7Wr3B05uAKmYvRtIumnywY165XTSGqFehLkS8dPGWeJ8K9mugiGnm17V7IH5C5FjNDV+iPY+c9Im3U/75JwHmXqUotAn3Xgt8IWQQdhgJVX/XZfupfDURJNDsg== 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=JFXi9A25+K3N7kQ1ZNUVXkVLVkrxcrgM8fX2aYGEdiI=; b=3miRvD+RZFeBTSFrsrY75Tzwo+967oiN8xgxW1jMbobkBA7h0FvxdpuwmQ1fszLcGICwbNdxrNaARudsNSnd7Z8a7L3DUsGJB943G/thlTHOH7RVJKnTifVQbXYVVz0G63K9Y+pmBBoQxyCk7kWEXapSx1e2qKNvZPDE4XcOWqEc9TfdSp3cRgbMsf0+pdBYaG5mzRZjArHUFxCAUgS7uxyNOurRvKO0dBU0zBuXJVYqrRW3NuvqGn/JMzI5ctmReuvKcHWPk3D7LPuHaXeGOshOs4oL9QJa5xy8LBa+XpMcJX0kMCk4wEesYDm9M/5A4GE0JSYgOBKgjJq7mWF28A== 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 PAWPR08MB9688.eurprd08.prod.outlook.com (2603:10a6:102:2ea::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9073.27; Fri, 5 Sep 2025 06:44: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; Fri, 5 Sep 2025 06:44:39 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH v2 6/7] fetch2: add support for implicit urls Date: Fri, 5 Sep 2025 08:44:18 +0200 Message-ID: <20250905064419.2589111-7-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::8) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAWPR08MB9688:EE_ X-MS-Office365-Filtering-Correlation-Id: 04217bee-8594-417f-6556-08ddec47aeea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: aeNo8qrEBW3wSVcJLfTYT9KNwg9yurG5mOMZPg9EYsVm/wZrNISBnqhY5+8ODmyrFLVibORiB4ryID5rMwTjqDuPSn/+nlAByeQrn/W0DUs1S8Det9j39SOLrcpAGgUxoWxYbg05VmtGlBOh6bobiDmMzF6oIrdWQbH/+4Rf8s4mNG+CujI9r8wtAGqrccKrJ1WsDv5Z0kQgYviF+pjsWJNGGtgQ+d186K8ZgEV34LXYl4/t97rD6Rf//1gUi9vs63EL4nn1atO5l4xTjKYpMyMBF8UhzQCj6Mjdgtdcb5PorQa2AvAHg38cN9WMZwS3P95gfTEV41ba+WMvu7ITI2/lwNpQ9yPH7qihVDPtTN5JWBRuDO4DprjXQzl2Je/CecNjVo+fuIaOyOQGu214cZ5cBmMimC5TYEof4aXHsDvOH0+AfNLYSXBlm+4cWrJEzsGo6kL7ekGnaLliAdToYLsiWY5lmePhcbvEk8LAWeppxwWxBuIFJyeFlnrTEXnq4Zq6RpJyzbtG3Tsk6LdY6wgMsefq4XVaZJLkOPhaH1/tN02/yOKbhvu9LxrGY5C5yyGPTrLK6bpLPYjvFA4mVqMfyPpQg0x1zsYuU1vOJ85WUrIL5Cn9GaKyG5tSmKRXV6hFeGhrcIXYBO4YpbAjLPDLpY0UACoAapDQGhy19D7hjPJsb3A9l1EGqOvPICpUc7j0vlThcVXMZYMi07rpj/ZPc/l7q5VKPHHzhciGL69q9EpPAt0Vg9mQtYBWjD0fj0WWooafIi6LK6Jw9ZbyTeC48u4vWOD/M42yM7k407v/7I4MtEANsM+jCbWMBf+6lwZecHxb0jXwCNrPmJy9HG79x/H4sSZfK254nj0gt5qEzce2+xs8xMWpVeXf5th6scKUwtkcjV94jL0iCMFRfcVl6288QZppjD7RCcMN8n6blRTRyR3cAeuc+gb+QeK/HZbBs91bOvrrVouZZqmS1wWJacnDHjAwFJS/k4dwhzxbYpHHBjo+C6rOI8dYoLmjKSZm3zdJRAoQ71dhZcpoho/FL3P86VXAeugiIIVNHLWARfDx5R9kIK6s4dNH3TLV4NyLWg7ui2AQrm5FzWYkzxxtosfkfrwm9T2qxU8qnRQckW/fkqFIxlM81cv/S6ECcdQmeFi6GP8rIFjv3EAb/+oodOcBZIpER8PYfMM89YgGZeMOllfkZxYTFIjFxkolYllb3EZzQb/qdG37XhFE6nIuHf+o6c8BDYUqWOZKWQpnEt2bco/lXN0F2xpKvoKAhRYpCdPNn31/hNXY+BU/31mKObAGHYy8U3JGN37gQ8TGh7inaKZdLGSBTBCXtwnGxQ5adUq1bl9UeywYADyt3S9AyY3Pz0oeDN/oFnje1bbU5MGYKJAsxOwsJixSXmTYRLs7Yvfc/xKUfWxvflj7YeD0lSv+jzSsd5qheqkgWp2/7mpewByS9VMTBwKhPJc9cBGpCHXmJLT3iiEphOYC8w== 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)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W69NwaJpp7ej6QuHUryhS4Ep3kVNHxuKz+P5OpgMlKIOYYSihzTBsm54qobwLwsL4FbB2tmAUHTwgdBbC6ZbUOTKa3P/cPISmfZ+UZAyKvtsZ1ndCJKmeah4Po4jc245TF5CDuMoIn0n5ynuZyjrO/UP6CX+ZCJagpIh6AF9iAYQDum6uKaaTdjqKcYZu770+jmJHQm7xNOo8JynPff2gkZAat8AULzQeroMZPfKBZGAamTy7ZcdTC50pzYscxgoU/g2peGN8CPLjnJ1cMgKh4vTo+p1IY6hIhIqfPrKUPmBJ+t2mpSOxvv25aIGsNA+9KKojwb3n8dSUPLoooxq7TgUJ/iAVUWD3PaLWPmJOgPLFAzovz5E8r62uSk49yfr0cwTaCv2//pDg+Ck3JE59kN/Aooq0CIhqOmeNvhJsudiHOZz9wL9bvA2BZFi+67a1dHxOA11yIR8LSnjAYuxxbVJLo2mm2O8OdqJrr90ai7JBDnCTe4u5O7fnQKpqp/whHx1iKmB7wCInw+06jduRMuhH5eDXi4oMA3ovchOILGXIr8Fk4I9d5QSCkWCwsH98KKEKh5fqcSBU/ypYbOOWq3jeVjrVLbiYi3Jthb3hsy4qCqoJAQTVhnQmEuy4bsLo6Dhce3/0mG3D5iujsmdtaSlrAtlpxlMUEHRsDojOWMpEdsHlf3QspFFWKvcPWSlB/sOcuBpg9C9kOZ/AYpp+TzXn8tvB4UjUAH56xjaHjKxXQdUXJEFLkGczJI8t+8CQOqt1U0Hq3PFxrwAmvD6zfi6SHWxcK6/3KBGtgfYNlSTZ+Q96UNalpway3usVK2SAdf3EBcxtVsW54/1yYV0w5dYyV4bkqXe2w6h8ASOXVq7u1KDIgztcA1Ri3T8dZVoYFfG1E1//Z1yGn1TxMikdHAhiLmBym3XxERUBGgVR5tMGevvCeyNYY9yYHtcU8NxXSt5R/QdkwhYyXa08oVcNUsfYV9EuYMS2576w4GC0FqqOyW6u8c1jypX044R7jxJJl1EervTQNR6E7S/c+UH/RVg50KVrNAemXCJJ9MFWS6N/4tpc8ILQTfGnhA/0gPZXqe8RP8KsJchHiUPLz/V39U4ldYK+313VRy4Bfnav/JK96W/QnTplKAE5QxnyAHHwqW1l/7F3DBCJb1eV5Uje2F9I0HImbvr69EmyxxaoDAUo9NhASDo33AWHKhO2pbDqVV7IYbIA2f/7MRAjkblVAm3soB3TjafEgrRPtvg2EbPW8t7XbMKQrd79EuYmonDgfSwp+RGqlt9jCbRW3ofvTfVv/+jzvR+8RMwl8Jv6DqvB3G/MIkn5nGHI1ceFZvAGt4n/Y+HDeDyhwCbyfEn/V/j3lyg4Eeyy5OzvcI6TBS5A1RhSMIwf8uGt/CLtnmCKkKd/wyZfj7GhMBRl8tcJJrSlPrVuxSwQRnXYafmflUUxJcG1KuV2Y8eyp3zeoVj7wZocu7diGAU8q+LN36K+zscjYS0pHQLEBzYHTAv4AGXKzIT9HRZTd8zig1D4EP1A4AI7W3+kvbGXUzlZaq0MwyJeG0QIgOJd6K9Fk9IAUmz8NKMlWfEe6n3S+ISaDXpzuxoo+yzYTrdPvelmGY+Wg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04217bee-8594-417f-6556-08ddec47aeea X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2025 06:44:37.9924 (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: ELPI2b2gz7b2ECb05BtBxeWcm4HBtYdYiC2S+1fcmzyXPZlEg3k/KNK/3hDIm7uaEVv4BjVA6Nib5tpds36WdA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9688 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Sep 2025 06:44:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17979 From: Stefan Herbrechtsmeier Add support for implicit URLs which are defined inside another source like a version control system (git submodule) or an embedded lock file (package-lock.json, cargo.lock or go.sum). The implicit URLs are extracted from the source and thereby only available after the download of the explicit source. The integration of implicit URLs beside explicit URLs simplifies the fetcher classes and avoid bugs because of iterations between the Fetch and FetchMethod classes. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - Remove implicit URLs from localpaths for backward compatibility lib/bb/fetch2/__init__.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index c4d7cc033..1bf16b7e6 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1312,6 +1312,7 @@ class FetchData(object): if not self.pswd and "pswd" in self.parm: self.pswd = self.parm["pswd"] self.setup = False + self.implicit_urls = None def configure_checksum(checksum_id): checksum_plain_name = "%ssum" % checksum_id @@ -1409,6 +1410,11 @@ class FetchData(object): return d.getVar("SRCDATE") or d.getVar("DATE") + def setup_implicit_urls(self, d): + if self.implicit_urls is None: + self.setup_localpath(d) + self.implicit_urls = self.method.implicit_urls(self, d) + class FetchMethod(object): """Base class for 'fetch'ing data""" @@ -1727,6 +1733,9 @@ class FetchMethod(object): """ return [] + def implicit_urls(self, ud, d): + return [] + class DummyUnpackTracer(object): """ @@ -1960,6 +1969,16 @@ class Fetch(object): for url in urls: download(url) + def download_implicit(url): + ud = self._get_urldata(url) + ud.setup_implicit_urls(self.d) + for u in ud.implicit_urls: + download(u) + download_implicit(u) + + for url in urls: + download_implicit(url) + if checksum_missing_messages: logger.error("Missing SRC_URI checksum, please add those to the recipe: \n%s", "\n".join(checksum_missing_messages)) raise BBFetchException("There was some missing checksums in the recipe") @@ -2022,6 +2041,12 @@ class Fetch(object): if ud.lockfile: bb.utils.unlockfile(lf) + ud.setup_implicit_urls(self.d) + for u in ud.implicit_urls: + unpack(u) + if hasattr(ud.method, "postunpack"): + ud.method.postunpack(ud, root, self.d) + for url in urls: unpack(url) @@ -2038,6 +2063,10 @@ class Fetch(object): def clean(url): ud = self._get_urldata(url) ud.setup_localpath(self.d) + if os.path.exists(ud.localpath): + ud.setup_implicit_urls(self.d) + for u in ud.implicit_urls: + clean(u) if not ud.localfile and ud.localpath is None: return @@ -2070,6 +2099,9 @@ class Fetch(object): ud = self._get_urldata(url) urldata.append(ud) urldata.extend(ud.method.implicit_urldata(ud, self.d)) + ud.setup_implicit_urls(self.d) + for u in ud.implicit_urls: + expand_urldata(u) for url in urls: expand_urldata(url) From patchwork Fri Sep 5 06:44:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 69731 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 0B059CA0FED for ; Fri, 5 Sep 2025 06:44:55 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.84.128]) by mx.groups.io with SMTP id smtpd.web10.15210.1757054683279460090 for ; Thu, 04 Sep 2025 23:44: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=UJbwgXmJ; spf=pass (domain: weidmueller.com, ip: 52.101.84.128, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R9EIigSbw8vBmMYJ07aT7iIYre2vTAh/BNFs9dOKU6AYDMVWsf7WNthVdOO8KcpLMpvGGnoOj0qhpVaFWcBMllVX3gUQZ+2tqaMh1nKrjsgYzcdjQgi9KkL01cg1IVnW/krCg/Tz9/dKJGAJTIKvJO6B90Lz/ElBU++VsxArL2vgrQmynkJ8CF1mqak8xot7X1VwNZAcMCOpd3EqjdJP9G14t2MiExILuLi20Tr9bfR4WeFu+Rlwct9txgdF09Uqak48OxHOcPHIVQS6NnWjltFp0FRS/B+7eU9fWCQui3Gf5zp5fB3F1WikPcz0Hlmtf5ofc3RJ76aM3h8VHEH/Ag== 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=lVlBTp4MzhBKPvGJEY2xKsihXciryfiPeij69616WvY=; b=RvTvxWgtdQAYZJltqZr4hqxLZGXJ8L1h0OdFkn5j1PDW/hmtvLJ/iOXR7SQ62l1FEw/kXdpn4TDZ0EbPfH1bfENF7SwNFxI/yFTBAX6KzP8m85QrzyLWkg2HCAZelDXfgbc1/wuAVMdVdT9YCxvramoPCHdzPMGagPtykd1J5/4w3M9VHrI9O1DXdnd3tDQ3R3SGtkeR13b6MozM46gpUTFk9Up/3vQxIs08g71n+8j7KN33sEb8IbblxURX0jU7pNj23wbqTr9JQrHjnRUFYPzL1nKUHxfU4J2KFqZcRUbdu2qwOGLZ1Ugrdyi5BQvTvGFFUrwICNCSWiwNvlXczw== 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=lVlBTp4MzhBKPvGJEY2xKsihXciryfiPeij69616WvY=; b=UJbwgXmJG0E6rLnfEA73TZeaYDJdYbRVevYTmwZiXX1Z/6W0tpKpLHvVIbMXIcItruUSAruu4+Y8UgPC1aKUlLFkPUxKYsN+LwXObDY7HjoKzop+H2fj/976QLkAFnENgwMDmllZYeinVs8USV81zReNbUcwZVTDyGFYXFR10/U2yGi9a1G13mB7mh1YhfG0ah5YGEdTSTZoXQfChlhoGTIIzSSyrUJdQEp9njvN/x+HLmngvhXmWnwCoDi5zMeM1zW9XXMvd2wS2VcDUgn2CpcScFrezM++p4qpFjEa5GYYZApUk24613okHWxdthw10nU/GROGAO7EkYbPQSQbNA== 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 PAWPR08MB9688.eurprd08.prod.outlook.com (2603:10a6:102:2ea::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9073.27; Fri, 5 Sep 2025 06:44: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; Fri, 5 Sep 2025 06:44:40 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH v2 7/7] fetch2: gitsm: use implicit urls feature Date: Fri, 5 Sep 2025 08:44:19 +0200 Message-ID: <20250905064419.2589111-8-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250905064419.2589111-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::8) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAWPR08MB9688:EE_ X-MS-Office365-Filtering-Correlation-Id: 758c6093-1540-4634-e0ed-08ddec47af31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: sQMINel4rhx9m2xqWT1FQPkI1jD3RvRCHuYs8/wgxYhxzFGEDSOonXz3mu8LK3zzOhh+J2tYy0eqnL7Bq5MI++J2of/dsl+f56LO/sQmhqh5F7mwbU+qGBdZDgiOU8I0027CVXMRvZSHRliv56vj9gyjGCvGqDLpK5owbkTtegOmWPSJOyFL92Ql3N1DTz+eX/XoyBe7qjn6QPNdw2XMRjW/EcwMQT3j0ngLftIyHSv/dlPmLiNvfYlMpd9RlfhC57nPlxt6cCYvJkd3kFFVysmGb1gAd/EwFmAKUgRbeBbiiRLYB1SneAvhiQjXKwotJKzBC7L+p/xhrIso4weesD/v2TbT1hJ3vXnoqrz579d+6ys9RSnDp5MC8Dlk6RY6SXBEI98NZvReEVr9pmxsWD79zrV8un1AhYZYEHVILMpz2XD8IbkM4Llg/1gbPJ8ZpG1WRls5oU8u8wORczsDlar8qFqcxPJZerQ+3Ix69DmAcS6jdh5Lu+yzNfeFyZCkFexSx5+YrJv3W6G/7wz9gDkOCMVrIkRBANgCIqSey+tygJodCFcOQ3v7nhyCpnrNTShMEyshIIRCjRpFwEMcrSOxRPXQG9nCXBLdesxxxivUiEA5SqNACgaODdDFvSz/JFCtZP39KOjOdYTO8TcOu7meKYI/r2VLpL+PVclq8sct1YucmqZC6obcn30yciXzA1hgvhVs0PhSvkZCWx7fvPKvuGUsTVEX/OuLsFmpAeTlLhdchSMZJGmSO76Jd5Kb/QaAZIDzaIpRhuTCjtp9Pm9wdrGjKX4uGfDf0rGVGHsPFiugMuyYGMMpeKeuy+f7TGBT5iVY8wTkRnI7BasgBI2sSIRZ3csFKhN/g1XJssRQ367cYcjuQZFZy/QE6DGIMe0cCrYZVfzr6DW0ioAirAPYaVn0/MOqJf/CpoQQcJkNtpmCQv/ji3SUS/stED0ZfIr47HE6qBlzw/l/8SuQmtK/dfladPaGWuTOy9O7VT9sJBU3b0aNDnCiqEzWv2UIKi94SyOTPgEzYVKkkgy4yiNIO+2vlcsHF6u50bkp/T3P2nBVGSNOmitJTr32QQxsQjQQQ+z3BN1Si35DQ++iCGycsftfJK+fjqWCxB6YULv35tSxs7I87ni+4QYnUeVC3eyq4oE6lVD/VzjMbjKdKtE31ItfhzfhszP9N0XielLiVwgXs4+LSKfvUZFeS0+MIXzeVooV8MOOvGvRI1XEVzhmh9hlTvDN9cExyT+eWtmrq6Oq7RhEgqKh86XqAiPyYi9loYa6opokrteEuM9bxobTnMQPZakQPJN7fejbL2/m4cfa+LxvKRYeuTwwK9R0Qb9WXr8PmL6ScHm61rK9cei7ZbL4kvXSrsgmjvt1rLo5xasQPZcDP/JXnb+9af48wK7W9GM9qfw/F2u5RLe7cuQSEpUuuRlcSNqcBKl93M61wZoCVx6d8zLmv69IeRz1dv87LhqaxGTwsRxxKhGq4A== 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)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a+spreyhtTM+OM2kP37WF6+96rlc8XlU2Br1v/H6VAnO79h4U+xpGCW6ABsWLK48AX4iLLs/Brw7VPNUq7dxIeOqOMad7pSJX7jYvRiFwvT1fm2KwWxVnaqmXhxxWTLtt8s94Ty2FO8oRvHrxVb93HzNa70aSssQ9Seb4E2HbutSPdipYXPII1nLxm2SdodBYGuGHSEY+z1uovLZAeFhVeE+Jrmq4cpu4hukn2yysUx4L962fLqbdVexDDZZ0uz97YKbkp1P4irkCeX0kEyQMHPtKkUz2Hp50PnSFwdZ0qwaFDn/IMCApO/Jz956xNSbbw45ASpnjSeHCtvhc0hdY98IJuAzn2i+M4H5e3cay58L6cWIprmVBUu/6Kf5OIPANQ2xI+iWfhHH893pl0MOwbzNo90IH9SHlHKJo/bEBZVsU72rZd6Zg53cRwbCU80CVa099qryy1jDXtsGxyeSv4ZtVmayl5d3rV6el/x8YNKY3f/Cad5bNEatUR/rccEjHRMJy2qoMRjJuJzqSif6RP+3ihrygfQILKGTOxmMUA89iNCiHFiSDbQzmvNpfDH3NmoFZZQkqBQLggr3g7whpvCqIznqX+wiEwuiv2sHAKRmyBFVBnd6XLY/hNMdz9J9Ao52lWKyb5e5BuB8MMK1pXRJdzSKx1Gy4Bib9sRJE00FKivZ1p1IT5LOt8Akpv7+0E7Q6Ybry093zX49NM//Izqq5jl9OrTmrjJhND20VWqsSflmKipGboG9t4PnjIlgWdD878Ol+fxj57v8tDq7g0YDu1D8nIxbIwDrK5G+NNb7EHNoL1XuBtMHm/dT+lomquCwtl9LUEXWIQ38ML6YqvnYE/JTPakmLPWUiaWEdCCrFMJWQTJ13QHEeUBpZ9jhnWOu37QGHVy6eblwISMO5Be7DDZj46SVqnIAf81/dQESUjmPlWcQxR3kvAh3V90hiDb2KmQ7c0VqyBZAKni8YCmtvVpBA5USaJ3i4XEjqC7NN7CS60+E0hYSygpNdWRzEZLWlyMjeFCmI0AOPh9S55cyIR5FAox8nXKcwjJHmu5OIAxMd1q/weYSoSZ5hJlaO3T1WxpzTNb8hXQLvQqR6gRGO+cfu89s6gjfwz9ZGZdGOX/88X6RtGiO4tSUXtV+TtsdZcUX++0QCHnkrMpfceamIdrbTGyd4d2ym8dih3UI1xWemvozakTyLwtVD2En0/7AQ2/6qEMPxpn3JVL9RpGADcd9Ye261lN5bnpsr8flygziDj+M86q4LJFwtEd0Fdja8lmUljFbBQ17pKPXQeGxO8swYgCSmN1ILFa/Jt6QKMF59PjfmZTXgtRZuNnVm6yqluQIjEDF59LAW1Z04nCumXiJ+iC6Xez9xV2TD5cVraQ1/ex9KL4u4B93RU4uLfURLWIkpRDawz16i+UKKolKx72snMTBhTmW3YgNVR1982s7XX3LaByJ8z+b5v5q0ffgsdzPRbpww2/a4JZBKqazY9uHhIKcdGe1uGE671AX/bCW3zVc7d8zL0vh7y09Ab1z940ORnJJ4r/sd45Gr2kkWD2wIUZ/BRYGFvoEa/2xKqRrEcmzK4zD60KWQJeq1ovxi9x+sHZxV2E4OPjgNQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 758c6093-1540-4634-e0ed-08ddec47af31 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2025 06:44:38.4347 (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: zmc/R+7ODnkKwZPIoSFuNNuZms8zGjqda+GCBzHiqv52ZCU6HNU8UK7N81/4a2xkiLeHkkL1dxWqjricgd7Usw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9688 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Sep 2025 06:44:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17980 From: Stefan Herbrechtsmeier Return the submodule URLs via implicit_urls function and remove the manual handling of the submodule urls. Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) lib/bb/fetch2/gitsm.py | 46 +++++------------------------------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 5ddc81f86..90fe92f74 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -24,7 +24,6 @@ import tempfile from bb.fetch2.git import Git from bb.fetch2 import runfetchcmd from bb.fetch2 import logger -from bb.fetch2 import Fetch class GitSM(Git): def supports(self, ud, d): @@ -141,9 +140,9 @@ class GitSM(Git): urls.append(url) - return Fetch(urls, d, cache=False) if urls else None + return urls - def call_process_submodules(self, ud, d): + def implicit_urls(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, @@ -157,27 +156,6 @@ class GitSM(Git): else: raise bb.fetch2.FetchError("Submodule source not available.") - def need_update(self, ud, d): - if Git.need_update(self, ud, d): - 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 need_update - - def download(self, ud, d): - Git.download(self, ud, d) - - fetch = self.call_process_submodules(ud, d) - if fetch: - fetch.download() - def unpack(self, ud, destdir, d): fulldestdir = self.destdir(ud, destdir, d) @@ -204,25 +182,11 @@ class GitSM(Git): logger.error("Unable to set git config core.bare to false for %s" % fulldestdir) raise - fetch = self.process_submodules(ud, fulldestdir, d) - if fetch: - fetch.unpack(destdir) - - if not ud.bareclone and fetch: + def postunpack(self, ud, destdir, d): + fulldestdir = self.destdir(ud, destdir, d) + if not ud.bareclone: 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): - fetch = self.call_process_submodules(ud, d) - if fetch: - fetch.clean() - Git.clean(self, ud, d) - - def implicit_urldata(self, ud, d): - fetch = self.call_process_submodules(ud, d) - if fetch: - return fetch.expanded_urldata() - - return []