From patchwork Fri Feb 7 12:46:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56855 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 7071FC021A2 for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from PA4PR04CU001.outbound.protection.outlook.com (PA4PR04CU001.outbound.protection.outlook.com [40.107.162.101]) by mx.groups.io with SMTP id smtpd.web10.68438.1738932445099229225 for ; Fri, 07 Feb 2025 04:47:25 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=2Aevs04w; spf=pass (domain: weidmueller.com, ip: 40.107.162.101, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UgqukmDS5oeBnMDDpIqKlNT4FzmiTIj6Cv44BY2KHb8i1+c0Bhv8WmMpzIrWdHK1GZaa9D5ysJn+9mgnotIEE13Ivp0m04YDIMuv+GZufsKkJWpKvy8KJPywjzkknbxN0zGO3dKTNiRW5Q+b6cRxMIeN1QbgPOjNWWHfdjFLDIYhhIgt6iF6aDnx/HFZSBd33NhGA/i9pfZUE8FmXwFazHvOVQ67WVVID3jP0agTq6aDtgVdah+i1/5+LkFsV6KR2xEZKKeZD+AiUlVy0ueHjdpjrGdxoUY9kC3ubkuoBZt+f+rPLoSgD5eAD4CwCY0JXUo8Yt/Zo40AE0qee76Owg== 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=ez4FpGCxQ2KAvrXZjcXdx+AwiyuugMQwa+zeyWgelDI=; b=keq7K3+iR08vW4wmxQWCnP6k51eLbaJxSVKWZOGAYMqn5pNdCdyD6tbRaGbmfeMLTGu8ByzGBI/CqKBoHFjgkRQRq3QlRjRrQX7+Ow1QUHhmtk5KIkrqPn8i4tZKoFlxgMC3f4vOLlOmJJf7Muzv2Ks7BATUrvaBQfVZbREgx8zo1pHQYb9f6JcVo8Jq5U/v1GtzNjo0M7bqcMb+6ue7RIofmn37mQqfuHl5CG4U0BkQ+avOMwowL6G2L6zAfEwEM9PzVp6UWmG7JUzxPgTM3GxaiBnLLASZlx4Ke5d3WOgHhbge1B/pUOlkW1eqGQm+4PMIGvAM7x+FPrG44ZdZsw== 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=ez4FpGCxQ2KAvrXZjcXdx+AwiyuugMQwa+zeyWgelDI=; b=2Aevs04wJ9XdgKaQEERwL90csVyXm+uGImih0PJOx+0Po2/P+Ti3/Fru9qYvAhpQNsE8wXartPEDN88iaH1l5UC/3ZvK04RaeR0Xbris/1uhyQcWEJZPq6SibIhBaCQ/E5sWDglrPDExlY+BkJhFAdoF9s9mv/JV+6FweujvWuNhmTuIACh+5rCtxI6NLjV8ksNF2NtTvMMMLq8caFgEeBf/Rn/l/vhzch8ZMhI5xdfg550t0yHxHL53/7OqDplqQhF7HU47D9l0euE1a3x6N3qPWG1hUzlycaxx0kDSW8OA5NqWXhb6OK7w9iATWFhxQbu0zVkyuZNck53cQhO6TQ== 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 AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:17 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:16 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 07/13] fetch2: local: use path variable Date: Fri, 7 Feb 2025 13:46:55 +0100 Message-ID: <20250207124701.14787-7-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: c96b9a69-6648-4c61-1b0c-08dd47758c9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: /a8QEFeezs1syY7FIQMCcLEVHL5Hx3B7VGuDq0LXkQWhiLT/fnVOoOqiXFtYO7cs1wQwPoPyKb8uSqa6JNaO8RfkuJm0sB1EWFQC3kuNYD+Ydm5p/29YtHyO/hys5Fdn3Ic60/I9pp7CphEpS9RozgEgcqwbNnfY3CHocgblqNTDyeQ3XvDKvZDhCyvTCe+wp15wkQEKXoZVbsuBBt8KzV9wfFerEE0vWEFrUpGNLrPdnPoVBgYq8A4lWeUReqlBg5UIVoZxl5W/VIMnLp+yay1MoYNteYMeApOC9L2z4wOKpndSWRBtoPj5GE5BzTFqqeqKEhoFJzQAnHzWxEfzIVbepMuKfayYWtBfF+tRs1cDT8YQ5lThg/RWK18MjCKQlnp/PyelmKmp9N1hoom0RpAdxfs+h67Rm7+Kuw4iqGIuTrj/l42BcaA+gkwwd/jYZKPGtjWrlqvkTIwqs5vZiU0JRq/3iPDFAxrY5uEqFhZk9m7GQJ91TfJV2twUSbw6S8ML+araMbDguDwLwpGPbRs1snxFNmjWswl1soeki5tYzx7v/R9nkw/2lrcuLQLI7d06wnyekipuV3jTpgGyRaaNEdhwGrWZacDUggyfaPnRswkJlzpu6MCy077YIdSoVfyvc4vSYwIu8RrBRrcB3tzKnjYHbODZxjX2SzUBtFdQEcXhf76WGjXeNDZX7vXovIahxENKvdOp2y9hh3AYyqKUdVeoApDvdEx+CLrCCtcPkY4T7ARzfGDLDIr9KGHDPOeK5ZXf9xiQnYPbwGolH1oqS02FDzVVOzuOkrDCpSVybOOepcTgnvf1hDGjMOZorSDn5MEBw49ezXbNi0bpNSfrXku5DMI/TNn0WdRsG2v0muq9Mybn8LVTm/YJZLXZWUDwJXbr+//FqBN+bzGhZGBycbr9kH8LdbclgEj+E592WjLLLGRxXWyTSzTEpXnRVNgUX/iCkcWnDw8dXP3logIZMa/WgjaPYtk4vGHz9GCJGdQDSqjcaM7mD8p3lZC5TpKO7jbdY5I6tYweeJgI9Vdh09szni550rRuNFGMOSeR38jYFHKXg9+a2cUA1+jXk3a3MmOr6owScQtPJNEWQcZzYGHFYQrvC4yNPSfGBJ7Z2QtVKzO0UieoHhpISNy/zIScVd+Ourv25rfa9Kv2MIYlWZYSJ0i89p3JF+EJ1MG6Eq5m8fYpf9Vcjow7tf6QpoNCc8lk8eQJtkAqdm3Lq+J6d2u1lwkk4HXPVhYGA60Sv0iNYuNt9/EX6D34mHHvAnIL2MyBClSWHH/HH85sJDZdcY6iEhoqirs3mUSTijB0qbsqQ1am/8sUBwi+ly4eMT9OVLi7XXcUuLkOB0vGyL6Eybst8Lw0deimSnvyZfbpSeXEfQCfleB0Qy4Ti5/dms5luXpTxAQ4qc2CC5XBsqEQblknrT4BEMiCqPuOY6G0w+KWuLLzS3PwaDZM4g0n 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)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6xBSmOHdQNNEggnYl5nBEHvI9YxE5JGz23tkgDvqeWLQVUR8HWDPVBPE40WZKl8KkTQrJ0481VyNu50rhcKpeMAs+7hbsERnWQwa8QLT0zLFwx/e1FzrfYWwatdsYNATkP0RyOX8LTrGFQiB4JZV+a37kvFEKmVdBHyzdjm0yp6PZhe75i27135fcQeQV5J+kRFV2LMrfMEcuECz4QFa8WkcJbacCC8xHLMYWV67cYBTxGB4hjKpT5UiJjHU3kEM/j2yuBUBtcnxq5d7rmIgkR/nsLC9CgujJTsGWeiD7TqZANTbCBcHxlR5iBPyg05gJVWHvInHH4c3Xz5424uEVQrnCspYNmBL5d28dRrjSXb8rcMfrpGsrqSR1MWafzcwt2f1UyjPtbhrYUYKEFtYFgOi6QQWpJ1mXoyv1cZKKmnosVfIbuEJwSbTiH7OaGd9ySfXr00Ib1epvKQ+1P1y98jNEnQt+ereCRbqIJpVh6T6GFsJN20mfVd7u+QrrADFwRxmXq5K50n+MDiMcDgVtBHchpVkkvtdzLBRaph1lSGeTc7kYIInzrabkVt02u44XucAqVhCnMvHiDog3OwlsaBg6o/Kw3wb/HFFESJo6/GhhAmTHI0k7AKxXbsRh+YkkY+Owg2vqOmq2chZu7UNkjRO/kTKgWrilEx/8THjqy/X9Rd9ST1Jaf2HdgHiLLS3QD5mCMEB0x3B51msF5xMjMogAit3OeVefcKPZX3n0vx+1UakIOVAApLB2ayS+O/zxn+pJRVU36s2a2sWpT26RquDhXmPZQfmai0oMe1AsAwoO5pXJjch4k4Ja3v2P0AtfWMZA8IXQ6E0ZUxbE7Nya5UbX5WbiaUxVvcBmneCI0TwXRENtjeH8d2+CM4JId2LFSC1amfS56NURC9h3mCzNLxznB0LzI5CpMDFKDk70U9ijSTY7giyqES7apOBoQoJYpKaLwOL6ICSQg7F7XQeAagraUd5xxgcbU7NWMYKd9S3q1L0zS+e8hkdS1mY1N5FkP3PNw0Zh9zjV4Ym2nfs2/FobZo6hJcP0jGWPFy1TNpx5XqHV7eZ7V39mQizfTPO3mh32oXicvAhuH2qg6VAbxKo1imE/LhBNQ/tdrbEO3LLN2d9tXC6A8yAlHBIXn1EZabhWyOPTUb81pPsZpKCx+TKgp25y3+HJ0lXInX3BRmcYkL3qDgI/liNUPSd3xiqMJbB1WfB15h2a1SVwYG1FFwxz8gufBzi/fLHWqRSkroAsqqfIy9iEdr5397ogIp4nmDbnRTfA8WpiaJeadI3bxyjXTPywd1Iz8129Tdy7LftR5BckOYBIBSOIpQSqr1o0nvSySUgGcTqGj9pSe/o3F/S8w7lUKuNvu5KxRzWEl631+NjKHi0l+dI5YGpmiC829tpF5VOC4CU5TX9Dj1+9Q7e2YSizliAHe0PWcE7bdjDJGgOfyQTwTP4kIg4Ub//oYL8WW5xaHm5bk+SPAoya+djPvACfBKRWIOV5YFflyCRPPjD3scCpcNbMTKZa7TYXB7vbeu23fa+hlI8E5UNAzLAYCdg02bc4fo7sXkodHeYFhX7whgQTrMiapJzwu8bn8ONojefQwRKkQuERUQ4uA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: c96b9a69-6648-4c61-1b0c-08dd47758c9a X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:15.5615 (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: rUVcryDm99f3G0hnmyrlS7bJdLD0/YTeNhdkDZl8Pbqa1GLVxn+bjFMko4u0+jWihbSFDz4xAF0Q+GYXBX9aBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 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, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17176 From: Stefan Herbrechtsmeier Use the path variable from the fetch data instead of decoding the path manually from the plain unexpanded url. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 2 +- lib/bb/fetch2/local.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 628cae023..bd87f18be 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1236,7 +1236,7 @@ def get_checksum_file_list(d): found = False paths = ud.method.localfile_searchpaths(ud, d) for f in paths: - pth = ud.decodedurl + pth = ud.path if os.path.exists(f): found = True filelist.append(f + ":" + str(os.path.exists(f))) diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py index 7d7668110..fda56a564 100644 --- a/lib/bb/fetch2/local.py +++ b/lib/bb/fetch2/local.py @@ -29,11 +29,10 @@ class Local(FetchMethod): def urldata_init(self, ud, d): # We don't set localfile as for this fetcher the file is already local! - ud.decodedurl = urllib.parse.unquote(ud.url.split("://")[1].split(";")[0]) - ud.basename = os.path.basename(ud.decodedurl) - ud.basepath = ud.decodedurl + ud.basename = os.path.basename(ud.path) + ud.basepath = ud.path ud.needdonestamp = False - if "*" in ud.decodedurl: + if "*" in ud.path: raise bb.fetch2.ParameterError("file:// urls using globbing are no longer supported. Please place the files in a directory and reference that instead.", ud.url) return @@ -48,7 +47,7 @@ class Local(FetchMethod): Return the local filename of a given url assuming a successful fetch. """ searched = [] - path = urldata.decodedurl + path = urldata.path newpath = path if path[0] == "/": logger.debug2("Using absolute %s" % (path))