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())