From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4D369457A1 for ; Mon, 12 Aug 2024 14:51:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4698F4065B; Mon, 12 Aug 2024 14:51:27 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2067.outbound.protection.outlook.com [40.107.236.67]) by mails.dpdk.org (Postfix) with ESMTP id D29854029C for ; Mon, 12 Aug 2024 14:51:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AdGUXG6x+B7poGsf+By74hX1mqt+SaGFg8+6YqDPjFSDaF2yj2qcPnMRnyPYTzAuwuAawYB/o9kis9y1hoZRRIZNwe/liTHhI1U6F9NoeUYDsMY5agLypeBSGaxP141nhjXuaCCEzrN12P26ixhnA3L6ssOzp9/oNI5CmVNtMNqiVJxYltLNCfOxDzu1loh1ooNfClHtGoJAa3WaafWy0v/QqRsg+FRlxH6HWs4k7nU8RTp8QJuaXmHS8W6K9v+uewfjjj7q0UBWH51k/UblYmrwotUBvosA9RWZPg7qwYjW9Pn3lSyfC7OMhDTRoeS6cP9sg6lxXBn/udh1MjJGvw== 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=wF66yKdyOQA769ji3Kp3THunP5Zx2ugleZiOnYgEt1Y=; b=qmE7ttxO6dJKRSMXSS4vYnDzULh3j81dCJWQMDiINyV2Ce8Km8zPFsH2bIGJHCqicU7sb2oKQN+Os0KTys2XA4qZyyb0/sWXGGOF6DBaSCtSFesXrMKf1kqagZMH2i7F1fadlbKcmftO/wEkPZ2wfHgIJ1uLkuhyHL1eHfADYOTeUUXJtKcg1/+DHSaOGyYLAn3aYesIey0uFxv21EX+U9OOqKQsC2ZrOOt8SyYEilFRfo6nro1ofgwatUzz5KvG0NN7dsUVQ2Ev/jQPPWTjpuitW4EG6eIVVB9BeVoGs7SQX0WO7AR0UJrSCZwMSkL02NMVpiYy2Bq8R1EcY9uDfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=debian.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wF66yKdyOQA769ji3Kp3THunP5Zx2ugleZiOnYgEt1Y=; b=e1Gx3048UCzLs2POBcMYN9mJnRdyM7F+npvcDNPyBjzvwB3mLLMijxmZmGJpBe3mPZPN7vZtJ+WHRwzgSNKxekMZJwYUfyNATKpEFOrDwWgMKEWXdzGngWRJ0R0fCe7ecm5yZA8FcB08RES04VZXdgOuCDlC462u6WIyBCn0dy86WYJAX/3clSOUGuYuw6q6YcJ17i9W900zKWUJM0MHGXK9LlSLc92oQovO2w1qDTezyf5GYSmRdxFSnRJ5f4ResQ89HtpFrdJ1AwDTFv/vb5ntpZ26Yt6aB6DMw1FJIRDtcRYCWGqX1cQxEbMjRJ/dpquIFlkrFWJgflKT4M91jQ== Received: from BL1PR13CA0443.namprd13.prod.outlook.com (2603:10b6:208:2c3::28) by CY5PR12MB6369.namprd12.prod.outlook.com (2603:10b6:930:21::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 12:51:23 +0000 Received: from BL02EPF0001A102.namprd05.prod.outlook.com (2603:10b6:208:2c3:cafe::ed) by BL1PR13CA0443.outlook.office365.com (2603:10b6:208:2c3::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 12:51:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A102.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:51:22 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:51:05 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:51:03 -0700 From: Xueming Li To: Luca Boccassi CC: , Dmitry Kozlyuk , "Bruce Richardson" , dpdk stable Subject: patch 'build: use builtin helper for python dependencies' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:47:59 +0800 Message-ID: <20240812125035.389667-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A102:EE_|CY5PR12MB6369:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d5646e8-68cb-4b4c-41e6-08dcbacd7854 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZDNDerRwuro6SUtShuXe7StnRc4+qx0rvAx/MKXT/75aXL7KdMYvppCi0RIL?= =?us-ascii?Q?gTeWGPppxmfQhma+Sr8WUXeY+7Ituxay6vrrfWAGDmKQz1Z8AhB80ALZG+jz?= =?us-ascii?Q?8ltBQIilhcSq3AchW4+ZcRkF8UmnBdTW/Zf/4pkvlfi4+iRGwVOGS2QiftyH?= =?us-ascii?Q?NAk4kmkfLOjH59m6q0s+NkFsuumkx+Mu50HhOWD5g0h4oWntlK5dz5ipa61d?= =?us-ascii?Q?ppgKD9gSuQyfF7G6OCbJ7xliamb7Q5bM4gIYe7QPR6obUdetH1tqLcsQAnGT?= =?us-ascii?Q?jFXoWEUzaQYL2V8ea/yPY3j5ZIkOAIyYeJTZrlssq8XyKljsMatCKxEEn3Zt?= =?us-ascii?Q?sYYTWNbRaXuPMxuNChLjr5eNdRMqJSXM0N/6MEfrKCN27OxCxvx8nLJ+6dZ7?= =?us-ascii?Q?H829MAfRMbx2wt/O/wRHZtz2hkHEPhBTH2XGYexxCV8TnWJ4uZAb4NQ9nWm+?= =?us-ascii?Q?n9VyfksFOh3Zfj12D+LlBViABEw02z3Lv8jg7FcCLHLhqr04BGD2xaK3faWB?= =?us-ascii?Q?2z5CEQrHfpvyCjs01Ku2K3+qBPvQOUJnEhBYdQB8k6Fr0z/yiCK/in1OEjAb?= =?us-ascii?Q?8/XrOYq2dxwr7XYC/dDCTQ1TZ9LfUBQlPE06LPG+CRaIt9tkGGExPdTBdaPy?= =?us-ascii?Q?nOhivfjBP0LDmLVPru9iYCmiL7Z4M9KX1NwfJrw5ccbMdf+wJ/paEyEDMOgH?= =?us-ascii?Q?D8JLnl1OsfvLTZCe4GVc5DnDK3sKo0eFDA3QK3DbAYMityGX5znQGmkruX8S?= =?us-ascii?Q?2MCvtUBBXhqhh5YI2V9i21MKQUx47NHnjCLHMBS6r8Zv7fb1hXtBD0oKmWvk?= =?us-ascii?Q?0oxWT0+fcnQvXKWZlC8fPV7LFv0lziZXpppI7Yd7sT4oSQsulWelAPxIvIQk?= =?us-ascii?Q?N/IGNQsqAHn/VAm8Hqt1kS6VeZDh8ZBdlaCVglO/81U22pyzvZRJ7Ot1EQHH?= =?us-ascii?Q?CjXaG6UQcZMUM/juereILO2cghW4JeQ51rmNXuUonFBf6b0xF0oil1HgfK73?= =?us-ascii?Q?Y+jq3haKOGpiNAK54FQYKRk/pSHCcnm1oRVBR3Mvs8ZKtN+QY+AkMm14CGCz?= =?us-ascii?Q?+lSWsk9kxPk/ypPrKEgZ5TTZ+y7E32L5zZHRUKtUBAOkriK4XhrYjrXq3Q1i?= =?us-ascii?Q?UrBaiAC++y4V27ryqitgC/yu/PpibY1gTMYFSVam8vr+LIoSoq25vP78gmdU?= =?us-ascii?Q?+5UpzH9pLVTysBzgazodtkpDHqLDAXKnImDcSU5pFD+k7blefntmCANNT9Ca?= =?us-ascii?Q?aosy8CaF1xOH9aXl1uXoCHgHTHftLsXUBgOxeDei02B3tJMsBQfrv3T8qpMW?= =?us-ascii?Q?Poxgzrv8ioGAUyP0h4an0h8PWxDgIrKCTL5Qbs5GqIFsPMUSVp4JIVX7Rkkt?= =?us-ascii?Q?fNPMBnu+KQJhgRUluzhA0VUQIMHrgmfk3uaIqP++Pw9J//ZpYC/7HioIz+fI?= =?us-ascii?Q?N4GroTt/IEJUXwxOm4p/ZIOHlTyfNzM6?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:51:22.7586 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d5646e8-68cb-4b4c-41e6-08dcbacd7854 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A102.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6369 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=acdd88c4f93a048ba306961b39175e8e0ac922cb Thanks. Xueming Li --- >From acdd88c4f93a048ba306961b39175e8e0ac922cb Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 23 Jun 2024 13:30:23 +0100 Subject: [PATCH] build: use builtin helper for python dependencies Cc: Xueming Li [ upstream commit 9ab7baa5c14b1ba928c09bda4734827d6d367d6b ] We now require Meson 0.53 or later, so we can use this feature introduced in 0.51. This also fixes a build failure on SUSE Leap 15.6 where the manual check fails to detect the pyelftools module. Signed-off-by: Luca Boccassi Acked-by: Dmitry Kozlyuk Acked-by: Bruce Richardson --- buildtools/meson.build | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/buildtools/meson.build b/buildtools/meson.build index 72447b60a0..3adf34e1a8 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -5,7 +5,11 @@ pkgconf = find_program('pkg-config', 'pkgconf', required: false) check_symbols = find_program('check-symbols.sh') ldflags_ibverbs_static = find_program('options-ibverbs-static.sh') -python3 = import('python').find_installation(required: false) +python3_required_modules = [] +if host_machine.system() != 'windows' + python3_required_modules = ['elftools'] +endif +python3 = import('python').find_installation('python3', required: false, modules: python3_required_modules) if python3.found() py3 = [python3] else @@ -45,16 +49,3 @@ else pmdinfogen += 'elf' endif -# TODO: starting from Meson 0.51.0 use -# python3 = import('python').find_installation('python', -# modules : python3_required_modules) -python3_required_modules = [] -if host_machine.system() != 'windows' - python3_required_modules = ['elftools'] -endif -foreach module : python3_required_modules - script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)' - if run_command(py3, '-c', script.format(module), check: false).returncode() != 0 - error('missing python module: @0@'.format(module)) - endif -endforeach -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:02.727146919 +0800 +++ 0002-build-use-builtin-helper-for-python-dependencies.patch 2024-08-12 20:44:01.875069251 +0800 @@ -1 +1 @@ -From 9ab7baa5c14b1ba928c09bda4734827d6d367d6b Mon Sep 17 00:00:00 2001 +From acdd88c4f93a048ba306961b39175e8e0ac922cb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9ab7baa5c14b1ba928c09bda4734827d6d367d6b ] @@ -10,2 +12,0 @@ - -Cc: stable@dpdk.org