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 0261643B86 for ; Tue, 5 Mar 2024 10:49:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F08884026B; Tue, 5 Mar 2024 10:49:57 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2079.outbound.protection.outlook.com [40.107.92.79]) by mails.dpdk.org (Postfix) with ESMTP id C3CD04014F for ; Tue, 5 Mar 2024 10:49:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FXKoFgx9GpPPkDUlYwcLhfzTzmn9TD0BwpX9jcaB6g+j9X1R3WD7FJQqBolip4x4pJjXU0rWAjl48GTWCIsc3FFKxnNDzKjS0HdxBeZ939+koPEmbRz8d83n8BE4oE5qhNc8Jvn0xw732BA5WqtfwLe/TU12Zf/cj43OCn2Oq9pVkl6t2zHDOhByMzc09qxIdaLjfMmdvwWxTQVdYsx+y5+mVDDdaUIYeJRTReXa4j0QeCX1T7KoSeLS5JZbtNR1BbMiIqIW7mTH9USeuY9A2D8FsUOROSIp0eQMzKGcHTlxyj8Dbzk7mVsQ6W5Rx2nY/pr+foYbjKjOcn2F08ZXxw== 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=94ZQlakY7mZ/G4zAe1UIcqVmQpZVPeb5jIiK5x5y6BQ=; b=Q7NSGvrX9fNr0rY6mBTE9KzggNXiaAwUBURuheoDs1XNwI5uu+fhHr6tvCZcm4PwNOhiNVAWcGFlO08BkGA9LFRniULbZgPMUSpEEee0+S4URS8UQaeZK2MYwC8LGR0sZ/JbCnkbKwjx+wQHx8PJOByREz3C/JBJgzkIiY7AS95Y8g6M+6jsJZNMtmSv6DhzwAvtfHVejyz07gJlIZVWMjbRXAArtFT7nVvQ3ue/KKUlxHMxfltz8SVE6PTnA0BIGg+fVE3SNZ2t0s3/eOLXNcSL4I23MMDytDQoIFDWSJINbs6pz7CP2J0MAY0j6hFgNhWLOPmSjsdzEFVAyjNWNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=redhat.com 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=94ZQlakY7mZ/G4zAe1UIcqVmQpZVPeb5jIiK5x5y6BQ=; b=B3eRm/2XylSp9sHWLoIjYeXFw5UrT0mjCY/uOQ1DAu4yY1jMN8i6NOKxRnufT9vCqxy+gyqHOd0HyvNk50IUSN9KONrusTEFSHfC+OfJFYGCQJ+gNLxkCbEba510uJozjKKviwquc32F9im0AJ4qmwA4VcXwkyttvMgqfdKHRP9GakQAji9an4OXPw15+LcnZ+h2rlDMzg5NhUWKOBDr76teVyn0heegZNCQPwkeyBAg+uu0FqApU98whxyUK8Cgp0abkhTjDSVjrH5IQI/wsMxHdZ611wK+LNzR6DCJ2rB6mKqlYDF8hvbYICLKHWO+gQ3tQ6mh9tZ3/1xAMwUOuw== Received: from CY5PR03CA0034.namprd03.prod.outlook.com (2603:10b6:930:8::10) by DS0PR12MB8525.namprd12.prod.outlook.com (2603:10b6:8:159::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:49:54 +0000 Received: from CY4PEPF0000FCC2.namprd03.prod.outlook.com (2603:10b6:930:8:cafe::85) by CY5PR03CA0034.outlook.office365.com (2603:10b6:930:8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:49:54 +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 CY4PEPF0000FCC2.mail.protection.outlook.com (10.167.242.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:49:54 +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.986.41; Tue, 5 Mar 2024 01:49:41 -0800 Received: from nvidia.com (10.126.231.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.1258.12; Tue, 5 Mar 2024 01:49:39 -0800 From: Xueming Li To: David Marchand CC: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'build: fix reasons conflict' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:45:59 +0800 Message-ID: <20240305094757.439387-19-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC2:EE_|DS0PR12MB8525:EE_ X-MS-Office365-Filtering-Correlation-Id: c36feae9-4a03-48e8-eff1-08dc3cf99c50 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Oez3elZ3AgdRqA9nxWJVpw5OPW/tU56ayBVys8rJowi3G58zYuQfOj4o6tsR0V2SfzpAOtekML2IamrxNZwm6AKuZWWW+W7c218q92ROyWSvjr1vgokQAA4nn+kJ+AYDIOAwP04aa5G0b/dDOUbvxXQHiQmgGG38ZvgChygdMDThJIKX3yqNaPpq6jH5hQb/PkvuD41+WlDhHIiD0UvfgB+xM6UaEGo8aMb6TlugKVq7R4VtYExbzPGd8sed77TMbsxAnhwp019cER+Z7IjT+9nMEbKjx06vm6YnU400w0geKoBwTjx0oc9EHMN+WP7rT9DKIGnwr8iN39AUQFrS34C7MJACq9bnRshQjnwe8m5F6MYM3eB8vuSqNJnwgG0s5cbaMUkwa7fXFQIvGCEZ8tV8WGqhflQmMZDMBAMs7B9DCHFCegYnChL9u4zlxIVYZS8YCujIphOyv/Rr+BIbNr6mr8vX2kklJj4kHqN9WWPbwkxcgoW7uRlmMveGS7keGgE3UpnOaPNhS66/+EjmVCiYOe0lIifDORfIVzrJZO92eUdmKkP4kduswsN8peIKAbq1v3h5GicJLpOMvLxo9nJKQaxvvJUmsoawocXYYW+2BJ6R20MYzyEWpTNuiDiCrWk2OckqeugXiE14bMJ/P6HQUQOLLaRcc2CSaZxP1gYNgVSadm6Bj/7IQwyQcYI+IJN9tBq2DkB3h6wR6mSPziMrWaMEKIl6e+J9xx8taflWqiBMvTDpPZLs217MAjYi 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:(13230031)(82310400014)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:49:54.5434 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c36feae9-4a03-48e8-eff1-08dc3cf99c50 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: CY4PEPF0000FCC2.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8525 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/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=7872a7b0bd6270b7fb47ebd3f10d70ff2e118d54 Thanks. Xueming Li --- >From 7872a7b0bd6270b7fb47ebd3f10d70ff2e118d54 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 31 Jan 2024 18:45:51 +0100 Subject: [PATCH] build: fix reasons conflict Cc: Xueming Li [ upstream commit a206a01537eb04fabad9236372991ace6c5c0b4b ] The "_disable_reason" variables are subject to naming conflicts. This has been caught while looking at mingw builds where the graph application was skipped with an (which is caused by a missing reason variable set in app/graph/meson.build) and the graph library was skipped with the same too, even though this library meson does set a proper reason variable. Example in GHA: ================= Content Skipped ================= apps: dumpcap: not supported on Windows graph: pdump: not supported on Windows ... libs: acl: not supported on Windows bbdev: not supported on Windows ... graph: node: not supported on Windows Prefix all those variables with the type of component. Fixes: ecf75180171b ("build: list selected applications") Signed-off-by: David Marchand Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- app/meson.build | 2 +- drivers/common/qat/meson.build | 10 +++++----- drivers/meson.build | 4 ++-- lib/meson.build | 2 +- meson.build | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/meson.build b/app/meson.build index 8aaed59f39..21b6da29b3 100644 --- a/app/meson.build +++ b/app/meson.build @@ -93,7 +93,7 @@ foreach app:apps if not build if reason != '' dpdk_apps_disabled += app - set_variable(app.underscorify() + '_disable_reason', reason) + set_variable('app_' + app.underscorify() + '_disable_reason', reason) endif continue endif diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build index 5c36fbb270..62abcb6fe3 100644 --- a/drivers/common/qat/meson.build +++ b/drivers/common/qat/meson.build @@ -17,13 +17,13 @@ qat_compress_relpath = '../../' + qat_compress_path if disable_drivers.contains(qat_crypto_path) qat_crypto = false dpdk_drvs_disabled += qat_crypto_path - set_variable(qat_crypto_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_crypto_path.underscorify() + '_disable_reason', 'Explicitly disabled via build config') endif if disable_drivers.contains(qat_compress_path) qat_compress = false dpdk_drvs_disabled += qat_compress_path - set_variable(qat_compress_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_compress_path.underscorify() + '_disable_reason', 'Explicitly disabled via build config') endif @@ -36,7 +36,7 @@ if arch_subdir == 'arm' else qat_crypto = false dpdk_drvs_disabled += qat_crypto_path - set_variable(qat_crypto_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_crypto_path.underscorify() + '_disable_reason', 'missing dependency for Arm, libcrypto') endif else @@ -57,7 +57,7 @@ else else qat_crypto = false dpdk_drvs_disabled += qat_crypto_path - set_variable(qat_crypto_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_crypto_path.underscorify() + '_disable_reason', 'missing dependency, libipsecmb or libcrypto') endif elif libcrypto.found() @@ -66,7 +66,7 @@ else else qat_crypto = false dpdk_drvs_disabled += qat_crypto_path - set_variable(qat_crypto_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_crypto_path.underscorify() + '_disable_reason', 'missing dependency, libipsecmb or libcrypto') endif endif diff --git a/drivers/meson.build b/drivers/meson.build index 5ba534049a..f2be71bc05 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -93,7 +93,7 @@ foreach subpath:subdirs if skip_class drv_path = join_paths(class, '*') dpdk_drvs_disabled += drv_path - set_variable(drv_path.underscorify() + '_disable_reason', reason) + set_variable('drv_' + drv_path.underscorify() + '_disable_reason', reason) continue endif endif @@ -199,7 +199,7 @@ foreach subpath:subdirs # component disable printout in those cases if reason != '' dpdk_drvs_disabled += drv_path - set_variable(drv_path.underscorify() + '_disable_reason', reason) + set_variable('drv_' + drv_path.underscorify() + '_disable_reason', reason) endif continue endif diff --git a/lib/meson.build b/lib/meson.build index 6c143ce5a6..55d483cd26 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -228,7 +228,7 @@ foreach l:libraries if not build dpdk_libs_disabled += name - set_variable(name.underscorify() + '_disable_reason', reason) + set_variable('lib_' + name.underscorify() + '_disable_reason', reason) continue endif diff --git a/meson.build b/meson.build index 5e161f43e5..8b248d4505 100644 --- a/meson.build +++ b/meson.build @@ -164,17 +164,17 @@ message(output_message + '\n') output_message = '\n=================\nContent Skipped\n=================\n' output_message += '\napps:\n\t' foreach app:dpdk_apps_disabled - reason = get_variable(app.underscorify() + '_disable_reason') + reason = get_variable('app_' + app.underscorify() + '_disable_reason') output_message += app + ':\t' + reason + '\n\t' endforeach output_message += '\nlibs:\n\t' foreach lib:dpdk_libs_disabled - reason = get_variable(lib.underscorify() + '_disable_reason') + reason = get_variable('lib_' + lib.underscorify() + '_disable_reason') output_message += lib + ':\t' + reason + '\n\t' endforeach output_message += '\ndrivers:\n\t' foreach drv:dpdk_drvs_disabled - reason = get_variable(drv.underscorify() + '_disable_reason') + reason = get_variable('drv_' + drv.underscorify() + '_disable_reason') output_message += drv + ':\t' + reason + '\n\t' endforeach message(output_message + '\n') -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:31.648534022 +0800 +++ 0018-build-fix-reasons-conflict.patch 2024-03-05 17:39:30.693566490 +0800 @@ -1 +1 @@ -From a206a01537eb04fabad9236372991ace6c5c0b4b Mon Sep 17 00:00:00 2001 +From 7872a7b0bd6270b7fb47ebd3f10d70ff2e118d54 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a206a01537eb04fabad9236372991ace6c5c0b4b ] @@ -36 +38,0 @@ -Cc: stable@dpdk.org @@ -132 +134 @@ -index 72e9138d14..8637b72ab5 100644 +index 6c143ce5a6..55d483cd26 100644 @@ -135 +137 @@ -@@ -201,7 +201,7 @@ foreach l:libraries +@@ -228,7 +228,7 @@ foreach l:libraries