From patchwork Mon Apr 29 06:41:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kari Sivonen X-Patchwork-Id: 42899 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 8E9C8C4345F for ; Mon, 29 Apr 2024 06:41:46 +0000 (UTC) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.92.21.10]) by mx.groups.io with SMTP id smtpd.web10.14532.1714372898724374060 for ; Sun, 28 Apr 2024 23:41:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@live.com header.s=selector1 header.b=q2BqdL0b; spf=pass (domain: live.com, ip: 40.92.21.10, mailfrom: kari.sivonen@live.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KxOBR5fRfmGAo1+8P6ao6RGVDBZTsMgQ5u+yvsKWKiiRIaAEj7oiH9PPIz7nlz9YySqIW0cFuyRuYwKyba3d9X+B/ieQoRfbYLXOArccNuufL3m+xjRjFtZ1k8n9orSXg6yboKvjjta8GUJXj17bFfT1qduD1I33m8nLUwZQq77EgaRFw19QN05I2KE9ZXoJQHHE+Y5vegruL2h4Nrkheim+l53Esx/k8bunKmbaIbkQUdPsYAxX7scHaCW5JwQWXKFgLTPnOkElZo0Ilb7c/Pta8zC9gde96ZrvSa/BnSFgIkEtpI+zUBBLbh/4KrBgzxUG3ZqH0yim/bypdXyrow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=hB4ZnDy1IA8LnFSRLaYxaq7GB6d+bWKJ6vsJ/lqwSu0=; b=ZLOsUMavgXEgKfcsChmb5QwIzkJeW22o1KePmxl+1yq4SKRUtF5C+7kT+aW/VrE/G9ebZDJ7VDkyI+c4hGxX3BPtucRFfUGO98AUZZxmZM73s8hRqtNJjlSwAdMePAMHVa8v1mbPOqA3QfL/cLs4Vf7JWgfm53O1txG/5DuL3qOoEYR1E6eWZC/yhbl4kq8+MHgY0A1vKvxDCXB8rBCb/Gxh4WygmV60aYyGek5kAguQyigDZQNlxyONLBXWX3aQ+wQgeeMSYSoUKDi4yv4c8Uk/N9hAfMXftbgGzCgrkRIrXTVUDEw77Kg1lkV4mfIo220+IEiZMgT/4k20NJTf6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hB4ZnDy1IA8LnFSRLaYxaq7GB6d+bWKJ6vsJ/lqwSu0=; b=q2BqdL0bekm/TiggRbq7wQq5g95ynyV1anFBJEnF1dENA+FvCXzB/wP36kUpXnX4lSjmKchAPVqtItIzTmdWh/e93q6nXmp3SdUOAQuQ4gh86N/46hZ7RlF7Akgh5+skztwGFv1su3pFITfVadFAeoZXbk6y0d4CUdyc/TozY459RENonVwXWQY4eBvZ9GxaBAlivnqQ3/J7Bs2IiPpsLETfqoymIiFFTXGCd+8sr+s0Y//fGMg2ILbWmPPvcSXSIY9Gq+/mY/oDdfZF5L/0RZM+8+LMUrzdZabjWhFqPJJVAM2aBoDMxWtNHExxpOqq/QLwcHpovzZNLJxCEZzBLg== Received: from SJ0PR22MB2795.namprd22.prod.outlook.com (2603:10b6:a03:3e7::10) by EA2PR22MB5332.namprd22.prod.outlook.com (2603:10b6:303:25e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 06:41:36 +0000 Received: from SJ0PR22MB2795.namprd22.prod.outlook.com ([fe80::85cd:96da:b540:78c0]) by SJ0PR22MB2795.namprd22.prod.outlook.com ([fe80::85cd:96da:b540:78c0%7]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 06:41:36 +0000 From: Kari Sivonen To: "bitbake-devel@lists.openembedded.org" Subject: [PATCH] Fixes [YOCTO #15473] Thread-Topic: [PATCH] Fixes [YOCTO #15473] Thread-Index: AQHamf1zIqd4N+wB9EuIG689A0SX7bF+y7X5 Date: Mon, 29 Apr 2024 06:41:35 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: msip_labels: x-tmn: [cDokl33LnFy7+br7JuYAw/52cmImLuN7viB7DEJbKH8=] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SJ0PR22MB2795:EE_|EA2PR22MB5332:EE_ x-ms-office365-filtering-correlation-id: 3cdc9a13-84e7-4ed6-a8ab-08dc68176a5b x-microsoft-antispam: BCL:0;ARA:14566002|461199019|6092099003|102099023|440099019|3412199016|3430499023; x-microsoft-antispam-message-info: +3stsHjldB62rrGkzIxUr6gzTeSVdTCfvxSDpRBPBS5T5bny0rHrLRnaxvjY+6jbW/d3MzCOghqp8ex8bJWkQ5Lch/NPrl7VnBXezb847n4KGUaaWVkJofPs8b0V+n/Sf8q/mHK8I7kAMmLpxujW1PHujMYpXN/CIfsSD+S69yjU3XEfaWGbGXSUL2bI5wPn7Q6Rm8WdZ59TWg3KWt5mFRu0XwhcMgIMlu1LFw9K8OcuRuWyZT9Sdi3wKV/NmZC6ioTddvoZmbUgzde6tgojI8LQVs4Bv3TCHkB/MNSF7PMTDbrD10GX0c0tYmrUwRi+e4G5D2r6M2wjmbfQW4pLZMKvvQo0/Ts0sNf+6dheXZZoXIbRbyfVPD4TOn3paJSrHeFuHuLF1X4UinFucMs9oi+IjNrLPBS/eBcuelVfAX4zLDYMkcktwsLlbVMa2KfePiRrh9Sr/ztibIA9j8rNfuEJ7iu48IHWN8PMdi8X/FAiIDWqXu2UuQ3bIfO+J3MPZp8j3i65GZMHu6ddXM7qXCXVqJ8sj3Xk0Qfa9e66LOg9Ou47NplU1B+xSSUHkOsykoP8tdqXMvmKJVWLkJQyLVETi1k3LAVR9siVeLY2IkYSVJiBkiw108TboFFD4415 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?GkODgoJvtXKKWN83snbQ8FG?= =?iso-8859-1?q?iQW5HScLCTQrZGITc3C+luIZwB+NuKp6ah0wCicRdWTS0tQ0aHSsqHZtYopM?= =?iso-8859-1?q?cGGsF6Aw6GyMufWs8UKDsgXFfr59+ZPmYfiTfHhkBCVJKUMWbZZrg6zy6y0v?= =?iso-8859-1?q?5PSLiS3eSRsR27XCJDaO+5ioOuO0kgBOrujdXe6xk7LPKpmqvXvwPIj9qDN+?= =?iso-8859-1?q?Y7INigb6tDkqwAdClQQUeQadWJYGYCnoGxe2GYIQI/oj+ke5s0nf0LpC0KYl?= =?iso-8859-1?q?2btiiRgBQ8HnVS6QiOfLJCtc7sRsuNtlL0NQfw4rHwQTHbFfJ5iw5WVTptNG?= =?iso-8859-1?q?ZMn65cpDxoFcjEron2kb6pZPq+8n4CtbLDkm7hNJZD3hkEMSMRrN7c6svDti?= =?iso-8859-1?q?yhsH6jbfjGD740gEL+QzsyBOqQ1JJZBEVy3Lt5onFPtiB1Olib1IXkPqmW7X?= =?iso-8859-1?q?32izKh9TzhDl9Wq4MovRFDyxj5796xRMIcfey1vgZozSvrUPhkYO4smu+/NC?= =?iso-8859-1?q?hiC3q/7puatwYIlxinT9biJNgHLG6XfqScY0ve3aIGyuqdJXO7M5Ys+Ezzdh?= =?iso-8859-1?q?qVFZlZFzo4glVkBAzRak4Z/Seh/wxb/DNTPyiGV1SBF/y0o8QXqeHTyajl0g?= =?iso-8859-1?q?SKvKY7oBFgEOc9tAuTx14E9c4x4NpDnX8wGZxmNQyP7j5UYrU3DovKcgSBmK?= =?iso-8859-1?q?AWGccuR5b/HmJxjqrLijCyNEt3M2X8pbeAkh+u1n4hgEqTXzQCZA/mdrX4lV?= =?iso-8859-1?q?nO1BCq2zIYgTjCQgH9twViDkvXmjddx4IQYbBWJmV6KdyockRYbOA1WNixWc?= =?iso-8859-1?q?csizvGny6FCS2eFVIlm87Tb885LpB9jBqkPurLi8WfQH2ug5Sz9PcjoSBfwQ?= =?iso-8859-1?q?r3zaOq+noLhQ70Ua1CtqCJvMznoqoriSsX50/Q6ZS/PUhg0MmdUntp7nJzA/?= =?iso-8859-1?q?okiScJ5I9CTxS+FK00up9Oc8t/KNU70SF5heWNjawITLPUv3naswgxUk4fYP?= =?iso-8859-1?q?f+q9E+xNMrJxv+1jIQG885CqrKaSTDo5ycu1MaRnrtswRxc8vpk8dLwWpTkY?= =?iso-8859-1?q?N23v1C/YEGMV1zkYuXpxt8oClWmGEXf13Ls9fgbmB5tJC67Tt8KCspaPLXQN?= =?iso-8859-1?q?0hrdi1MUYfU+w0N/jcomimhjPU4VUQS0ldS9WebENLDbDxaci3ez3ITTZF6m?= =?iso-8859-1?q?uYPbo/nEHUwrmGrctPq2skpX/1+3TkPHBBzrCTshodT/lI/i/5cLlW1X6wHy?= =?iso-8859-1?q?HQNv3XuksxUANYoLWESkIFdEeGe0CplAGqBs=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-c3c87.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR22MB2795.namprd22.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 3cdc9a13-84e7-4ed6-a8ab-08dc68176a5b X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Apr 2024 06:41:35.7167 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: EA2PR22MB5332 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 ; Mon, 29 Apr 2024 06:41:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/16148 Hi, here is patch for my bug. Send manually as looks like git send-email says it sends but something block it and looks not send. Looks like I need to register to openembedded also. Not enough to join bugzilla of yocto project. I hope now you will get the patch. -Kari From c52bb02702dd9b0148d76115797d609b1ef07e63 Mon Sep 17 00:00:00 2001 From: Kari Sivonen Date: Thu, 25 Apr 2024 17:54:22 +0300 Subject: [PATCH] Fixes [YOCTO #15473] Add return false to supports_checksum for svn fetcher. This fixes MIRROR usage for svn uri. Signed-off-by: Kari Sivonen --- lib/bb/fetch2/svn.py | 3 +++ lib/bb/tests/fetch.py | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) -- 2.29.0 diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index d40e4d29..0852108e 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -210,3 +210,6 @@ class Svn(FetchMethod): def _build_revision(self, ud, d): return ud.revision + + def supports_checksum(self, urldata): + return False diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 85c1f79f..66c93282 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -511,7 +511,8 @@ class MirrorUriTest(FetcherTest): mirrorvar = "http://.*/.* file:///somepath/downloads/ " \ "git://someserver.org/bitbake git://git.openembedded.org/bitbake " \ "https://.*/.* file:///someotherpath/downloads/ " \ - "http://.*/.* file:///someotherpath/downloads/" + "http://.*/.* file:///someotherpath/downloads/ " \ + "svn://svn.server1.com/ svn://svn.server2.com/" def test_urireplace(self): self.d.setVar("FILESPATH", ".") @@ -535,6 +536,13 @@ class MirrorUriTest(FetcherTest): uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) self.assertEqual(uris, ['file:///someotherpath/downloads/bitbake-1.0.tar.gz']) + def test_urilistsvn(self): + # Catch svn:// -> svn:// bug + fetcher = bb.fetch.FetchData("svn://svn.server1.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2", self.d) + mirrors = bb.fetch2.mirror_from_string(self.mirrorvar) + uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) + self.assertEqual(uris, ['svn://svn.server2.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2']) + def test_mirror_of_mirror(self): # Test if mirror of a mirror works mirrorvar = self.mirrorvar + " http://.*/.* http://otherdownloads.yoctoproject.org/downloads/"