From patchwork Fri Feb 7 12:47:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56848 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 4CEC6C02199 for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.65.129]) by mx.groups.io with SMTP id smtpd.web11.68552.1738932444338795086 for ; Fri, 07 Feb 2025 04:47:27 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=leiSyZDx; spf=pass (domain: weidmueller.com, ip: 52.101.65.129, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RyaXcGkZM+OuLcCoEB8nMi00Jok/U1jSDsRhaqJX9YOTDIRP4ELeYz9j3TjQMt3YPFnZp/XNIqe/Ald48py3uxtwMQenNdajQTQeh4PDGhUckmsyg+kgxbadE/RJSkEoh2Na6qxav+VHpyVBQNAAKc/jvvP0ehowYgzbUg+3GHT5X7oFAnENO2UEqIFGDItQ++q8k6wRqcSUVds7IdVTKKNc2aW2AnJKLgDDbBs7oYCpx6JUi090NYV4gtR7xwHzk0mrP7NCW79SPBGwTFEqO8IJgnVLLYkn8ZC0SoE7amZquV7VOEAI/eARuTzmJ44jPHZqeHiFpywhe00I03txKQ== 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=Rmv7hksz5Sqvz1EDeLwsF0l2sciZXa/WU57kAW17UzQ=; b=zVKzg2qxSS3nGeOtj0V1Um2nS4QV/yldv6iUedKT56DK15fHBWOLSmrPfql8cP/zwE+pO6hRtCN22XTE2NSt4dGpgD0KtT2+qkr+nout7xfAqwCZ68M/iunaykw318c70djCWlAsqlAm+CPeIjKBZ3WNXtXWi4KwjWBP+t4yn09mnZZdKZHVETpfZTU9wNPzcuakcTk8ppt+d9L/ymbN2Tirf9G1HIrkFRduvbz3v+3cJXrPp+6+jqD4o/PaHJUMaUNaBWVbMrzF28F++GT+NYDCV/DF4jbEAP2hHJgZUkf3rGY3oOxCWBIyv/F/Bs6B+oSWVcxR+dlFxQNuFRzAnA== 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=Rmv7hksz5Sqvz1EDeLwsF0l2sciZXa/WU57kAW17UzQ=; b=leiSyZDxUd2YFHE69rnnhphrE9SBkTVWXBLqk2LEpUHIwuxjXXGtETbX37WJlkpl5Mtv6+CGJ+WJH+guO6wNeuboRmgYpo/HQMa2R+SsKmWjPwaIFiaVBsmo5+mAAErxN/2/Pq3SVeHMjweCAQ3Dg94Ocbkevj53WXcvehSt8R4zmoP58SGe7JPXp3EVmpWserv0MaFjgveIPEE6T1/we/LeqNoIhmeNaQ6XrjdS1e8TQYvXGEBAdKinf41A0xdxETv17X17cVVnp/eyV6pJ3NklZ15t9geGR25Pc/P5eiuXiv75nSvj3OwScXGcXeatytYrkPGnX5B5nsgMQQaSWw== 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:21 +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:21 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 13/13] fetch2: use localpath instead of localfile Date: Fri, 7 Feb 2025 13:47:01 +0100 Message-ID: <20250207124701.14787-13-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: 42bef2d4-3ba2-4f90-d8f2-08dd47758e8d 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: Mt9vQlvrvD0qtflV7KOTw2Gnl3TFy0QSgJ7BfTRnhgwlkAa96l/q0zqIlIK4NuA3NvyHTKoNNOMRs+oa9a597Y1t2igJfwzKtGtJUPdI/RBEQ8AVCaHP92vlV0UPXLmvIb+dSOibvdt8FIq/FigvnI0BH9N3mELoyWEdkdg6k5l6JkP2ZT4yrddEoJciomvr9k+KWA6PlDNAg4GE6eub4WVyYxKfUS3tHOiTpk+19IBrNYTJndk5mhsIVZ/7y3KTR7y2YXgo5YhHhLfI/86QJADG6GdjjXoL3lc3SPYMEt1AFYIwIRtlpH3APBFLMp6rTD1KTWqPJF0dh83nIHn8NTaUO5w4pEOXDIS0igQR3XjET4xZDgg9HG9jDOGIBAiAAkrDkzZHfv3t6RYX97gj0JuSGzXUwubmhv1wJ4tXpoidQ79jY8i/ZXizFTX7wBm6e8N2oMHWMcMblOggzKj03ev3z+0l8UOftNn43sqn6w/z2XRYu2DqslGZxxEQZLapYoOhSUzPjRakGNpG/q1OBzg2+ZvMQoVAnjf3+KXfgC+ZKdys0H+LBn+blYVypyMLZ2RfeIf0EwVBQcGp9KCDqKkcNtOKa4j+sEvMdT1tIBMAidHrgj1tVvu+eitK7R+g4bndLOdpcIjg6EDa8t5uDTRH23tc5mRsIZROmHO9TO6+nxDsQIyoDnzduRjeCkYjRyphSWV+VxbzJL0+QXMzQJTz2ZB1E34LE5UZaQ9cGAm7qMEgW9HJNt0ygKdxUuVPr5b2KU2ef1j6KSUtLwfJr/fzvjErX/KKjlv7Trn3zOtNFSek48fLtYihYGMGur9yDKRyczf6ayipq1v/GI+Jg9U3iWJnTMFuLiTVshl/0SM/O5UmsXkUBvFHoW7z1dBrR9ivvfwdBxtii0cmTG07I+to9jAHLew6JmnaO9rOvOMG+s2XuGQ1fhDTjPmcvB6ML8ie5TrGVtwuVPzPiXv9o1j7Y3KVcv7F/mHhHDBFQHVRlav9JMHFZxIzl4h7o/WbKiD1zbc2tFLOlIAQY1K87eP3aRDFhWCaf+FPyob4KY1EBBAO3Jt/soiIz7t8uLiaFicdV65tNYk+26pVOdfHCJgGgvDi5Z9K8Ker2cGxLwXGr7IU0BGwJK50wLAUSVIFuCQguGMkpIEcZNwN4+6Y1BWfOg12rlk4KBWARb7FhZVtTZNo3h0OD9Td6qVO/aBoM8dTv/L72QqZ1tm9AbrsCKcTr1bpHJGsT2oVFuQNI9EmQ6xmip0HZJhnSad+VMbZGvLSunQGqZQzJA6Ezf5pzNJUm5z7+fNTLSwkImWBYj3Bd4KNF6bBuLLJoW1pdfcH6sa3uvyAuLmT2CHAsFneqLe3fX3wzPFi0sHadNwaCv3jM6dT6JCWuwXAn8X4Vk+8OVlt8qPkcDovXQZCIV4fT6T2AR57FMRaMyDwAJKYg0I/cMlyEUZdQlI3/bGQpa4s 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: SyFx5gJWHzW95/vWopTnFebTJAtCO0H7/2zN+7M8wcYhi+chEuCvM1NkGqi4QCYM0/ticThLZWXF+COHtjUXc1ih8pGtntsqhUDdRh6WRgqt27VyP5Ic/JzRgOTXjYYiuq7p4PBxpVoc9g2j2gDC9Eog7xyctLpLzZzzTUhI/IAuCYj+TWIWI3yvkncbvChR3iGIY5tRWGJhW2QpVdIkF4GCzMLAZoGoV1CDgJNOjV9lsgE4QwD2KQOPmDWLYTPY122ppZXJjsAERxcEw9DfJv+TaOwkR+5ydeeU5SZDzwxr+eWvk8pf7M0F/47MwCOyNlKiKl6Bqs5DEPvVmtHi7YBsCnDbB0+H/3tmWIzqAZX+TPE0/tERvNPYvBdbfFbeN4L3XCpv0h++Db7A2OAq0FAbnDg2oYMPkw5aorcOWEbVqyV8KU03gPKuTPg4obhQEtDt6HCFZ0cBBiF3kKNlyJFwqE5Z9Ade2w82GT8MnmfLncc85O6mue9zTFmy+4aG5tmp+ZgENoctpVXhcBokpRsVHekFHaUncli1atq2BbEoI4UJGZT3BC2eOaoagu23pFMq23XwRppRVsQ2dQzB+ZuBfUvlyhgABzIjTJ1yuavnzBKdwxgH+hwKirRpIXzJi7r6zGbsQ4o5OOb4emH75RZsGXK3NQ6mZjX3NRFaYjyxDCWmv0Yulud85ogEHJBZkLrgegLa/EiktFLxHJHwdQFMf0YgGlNL0cjnZBUkITootj0bqJArDUAEQgOLWKK+GI1tabDp8Ev467Gh/RaEjAll5evCBNzPPE6k8MNah/OyOda8I4HsTgapL3PDYvRH+hTMgtr7XYcSqzEzokBF5Ob0YruKBWV3d3Hs6PVpOzZSGjFxuu2VTgbjHUqDY28tfmKHvJRHZkzsyR7KMM3e/56w806YpKOcmJQOSIr56CjhhR24Z2QwwHi6BTavZgydwQd8joX2OHTI4SSOy0py/l4p68CzNFFssc9BvPtKAA8whB7ksYZutGrBHRQ7Er2QcLk0JswkknORLL6n98Ke67v0DbvBXNTlrKVanF/Kbpm/9OxqmZmJ05AuWRCAXQ8k4kTF9I8IBqqNH8qyeqKxzab5KxAs7DcvvPg2khhsUr85o7uOw76VBMTYmvz/sYldhTzAhqEd+sULDIeLkBCWYHzxEbvjIPu0w2Now1pHLRWtCHoafrp6IPB6kZq6q8m2Wu6nn4rRyqmdSDbO14i6xnFe/ZHDJFtCWJgD+HG80QNrlYQdk415n+Sqhf1Y5UaJr6+Fsr2alfPhiJ33PDBQV7KGZpbUwzIQEV1IJyGKI1eiUJjXCmGoziBr6RoiIc3yI4EO80TK2jtdDojoV/rrGJAZmLN14NYznzPyZ7ES4zAx0J892V4G+1mW1WSnfnGZM2LkDKvijoai1n3v/78od5c3x0MUQsmmtpQ10sGiQUGu2FmI1eLswpu6fvSLIkTR9hN0sW0VW4mDt2RXK4XvtOYxESOBT6Bd8Gghn/gAiKosHsqn9JKt87owMuvy70PoF0yle6lIPBoZ31mEeylFKETHQMJEGW1kgw0P8JQX8ozuBGzGZp74a2ux/WyRb+DsSr2fQJbixK5h6VZGO0LMfA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42bef2d4-3ba2-4f90-d8f2-08dd47758e8d 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:18.6308 (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: wFqj0yJSSLUtIiwkLOAtWGvNXiiDR71iiek0gpBPoIPs3k0e9NxaTThAKklop3oa0av+KGkkDDKl0d7oXJtXdg== 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/17181 From: Stefan Herbrechtsmeier Use localpath variable instead of localfile and DL_DIR variable. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/az.py | 3 +-- lib/bb/fetch2/repo.py | 2 +- lib/bb/fetch2/sftp.py | 3 +-- lib/bb/fetch2/wget.py | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/bb/fetch2/az.py b/lib/bb/fetch2/az.py index 346124a8b..1f0f1337a 100644 --- a/lib/bb/fetch2/az.py +++ b/lib/bb/fetch2/az.py @@ -49,8 +49,7 @@ class Az(Wget): fetchcmd = self.basecmd + ' --retry-connrefused --waitretry=5' # We need to provide a localpath to avoid wget using the SAS - # ud.localfile either has the downloadfilename or ud.path - localpath = os.path.join(d.getVar("DL_DIR"), ud.localfile) + localpath = ud.localpath bb.utils.mkdirhier(os.path.dirname(localpath)) fetchcmd += " -O %s" % shlex.quote(localpath) diff --git a/lib/bb/fetch2/repo.py b/lib/bb/fetch2/repo.py index fa4cb8149..5c0edf1f2 100644 --- a/lib/bb/fetch2/repo.py +++ b/lib/bb/fetch2/repo.py @@ -46,7 +46,7 @@ class Repo(FetchMethod): def download(self, ud, d): """Fetch url""" - if os.access(os.path.join(d.getVar("DL_DIR"), ud.localfile), os.R_OK): + if os.access(ud.localpath, os.R_OK): logger.debug("%s already exists (or was stashed). Skipping repo init / sync.", ud.localpath) return diff --git a/lib/bb/fetch2/sftp.py b/lib/bb/fetch2/sftp.py index 2a2a70a1b..b88dc5a28 100644 --- a/lib/bb/fetch2/sftp.py +++ b/lib/bb/fetch2/sftp.py @@ -82,8 +82,7 @@ class SFTP(FetchMethod): port = '-P %d' % urlo.port urlo.port = None - dldir = d.getVar('DL_DIR') - lpath = os.path.join(dldir, ud.localfile) + lpath = ud.localpath user = '' if urlo.userinfo: diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index 161c66bea..1194f0e7a 100644 --- a/lib/bb/fetch2/wget.py +++ b/lib/bb/fetch2/wget.py @@ -95,7 +95,7 @@ class Wget(FetchMethod): fetchcmd = self.basecmd dldir = os.path.realpath(d.getVar("DL_DIR")) - localpath = os.path.join(dldir, ud.localfile) + ".tmp" + localpath = ud.localpath + ".tmp" bb.utils.mkdirhier(os.path.dirname(localpath)) fetchcmd += " -O %s" % shlex.quote(localpath)