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 A58CD43C60 for ; Thu, 7 Mar 2024 02:33:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A00C542EB7; Thu, 7 Mar 2024 02:33:06 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id AD3BD40E5A for ; Thu, 7 Mar 2024 02:33:05 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-33e2248948bso180816f8f.0 for ; Wed, 06 Mar 2024 17:33:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775185; x=1710379985; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8P+qD1X/c8Enu5Hn2qiffOAv1cgx92947dqkhnvZ6Rw=; b=jcnUilRlvi/edV1wJY6HngZi9CVH9M8tGyiT0Yu42SJo2yTSL30sm6R/FqDP+xQJN4 xNckBDryGs97REZzwA3TLF95Hjja7iCY5DW9wGz1CUVYiebKSrNqs5m1ySPNDojx/sSR AAK3p/3rcjE2PYxJr1o/q0L/seJg4oKVXajK5mbC2RV0lJ7M8Is7GS4XKgcEDX7BHnXO JlXXXApkKBv0X466u2kN3NSGPowjkobHMGHtIvTnEeFiDWqaZKgtGvKLSpuIVv277QHx kBvlUrZ2nWecwXJlQX/2rq20sQffnkcLE8VDf0n+lz0xRH8HXNZjjQQBIfekk2JOzQOh A0ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775185; x=1710379985; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8P+qD1X/c8Enu5Hn2qiffOAv1cgx92947dqkhnvZ6Rw=; b=JCEcL6PNby9rhVIwzPeDk91jsmXNKzdSjKGKSUKTWwGof+aOrO49SWwpHQ0zgmsc8+ UFOmyv+W9w3xdaIHfh5o6NwLvPz+2+b1TdP9pVFt4bZGARMgvg0g7dY9RES27zsyClTT x2Vfx4h7/NLcnGxobGw2E1nJoslEtwWCxMZ6BfhyzmI4FORjw4oX04BLS4KyAuAF0v7i L7aAhZmSU0d28CAhlGN/Vk85O8QewijXtd47hYRa3QfyW+N1brrqvGNDjGqStmkFWoyY xsnvRAE0o4un1AIotiJo+HrN34FKrEdDbuFAgl+iNOkv75/SlE5WvFtl2CLKdhum57/U PwlQ== X-Forwarded-Encrypted: i=1; AJvYcCXFIRb2Q1JrHjHYl1Yjf2qaORsbR7JXUVYMYLTC22PqSXvH+grnY3/Bs9PYGJlHnW9JMr+BeJvQVqxd/TvdZrk= X-Gm-Message-State: AOJu0YzjchY4RPAns4ATB59m0sPEVMUiYLt1t2TUBMKy/QgYpZ82Yqoi obaVOQf9pyPgRBEGMiU5VvmhqtwqLRn0oKBVSBMAsEcQvt/1PHk7Mkti3qa8 X-Google-Smtp-Source: AGHT+IFEniR0UOD/r4Ma9a2WWlBLyhOiHE7IqzSTCByDRbaxqCm8v8JmgqrRFLYEkG1to7emggtacw== X-Received: by 2002:a5d:4c46:0:b0:33d:2f2f:e779 with SMTP id n6-20020a5d4c46000000b0033d2f2fe779mr12742053wrt.40.1709775185330; Wed, 06 Mar 2024 17:33:05 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id y10-20020adff14a000000b0033e1be7f3d8sm16607047wro.70.2024.03.06.17.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:33:04 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'build: fix reasons conflict' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:32 +0000 Message-Id: <20240307013159.1735343-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 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/09/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d9ce83470f195ec2d715c013f2bb1c78de3e5379 Thanks. Luca Boccassi --- >From d9ce83470f195ec2d715c013f2bb1c78de3e5379 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 [ 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 | 6 +++--- drivers/meson.build | 2 +- lib/meson.build | 2 +- meson.build | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/meson.build b/app/meson.build index e32ea4bd5c..81c94e2b79 100644 --- a/app/meson.build +++ b/app/meson.build @@ -83,7 +83,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 95b52b78c3..3680e0a215 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 @@ -31,7 +31,7 @@ libcrypto = dependency('libcrypto', required: false, method: 'pkg-config') if qat_crypto and not libcrypto.found() 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, libcrypto') endif diff --git a/drivers/meson.build b/drivers/meson.build index 5188302057..b4d9252888 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -159,7 +159,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 fd55925340..02dfa9b868 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -176,7 +176,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 f91d652bc5..86f59a2fe4 100644 --- a/meson.build +++ b/meson.build @@ -163,17 +163,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:36.369184584 +0000 +++ 0015-build-fix-reasons-conflict.patch 2024-03-07 01:05:34.682937554 +0000 @@ -1 +1 @@ -From a206a01537eb04fabad9236372991ace6c5c0b4b Mon Sep 17 00:00:00 2001 +From d9ce83470f195ec2d715c013f2bb1c78de3e5379 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a206a01537eb04fabad9236372991ace6c5c0b4b ] + @@ -36 +37,0 @@ -Cc: stable@dpdk.org @@ -42,6 +43,6 @@ - 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(-) + app/meson.build | 2 +- + drivers/common/qat/meson.build | 6 +++--- + drivers/meson.build | 2 +- + lib/meson.build | 2 +- + meson.build | 6 +++--- + 5 files changed, 9 insertions(+), 9 deletions(-) @@ -50 +51 @@ -index 8aaed59f39..21b6da29b3 100644 +index e32ea4bd5c..81c94e2b79 100644 @@ -53 +54 @@ -@@ -93,7 +93,7 @@ foreach app:apps +@@ -83,7 +83,7 @@ foreach app:apps @@ -63 +64 @@ -index 5c36fbb270..62abcb6fe3 100644 +index 95b52b78c3..3680e0a215 100644 @@ -82,26 +83,7 @@ -@@ -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 +@@ -31,7 +31,7 @@ libcrypto = dependency('libcrypto', required: false, method: 'pkg-config') + if qat_crypto and not libcrypto.found() + 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, libcrypto') @@ -108,0 +91 @@ + @@ -110 +93 @@ -index 5ba534049a..f2be71bc05 100644 +index 5188302057..b4d9252888 100644 @@ -113,10 +96 @@ -@@ -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 +@@ -159,7 +159,7 @@ foreach subpath:subdirs @@ -132 +106 @@ -index 72e9138d14..8637b72ab5 100644 +index fd55925340..02dfa9b868 100644 @@ -135 +109 @@ -@@ -201,7 +201,7 @@ foreach l:libraries +@@ -176,7 +176,7 @@ foreach l:libraries @@ -145 +119 @@ -index 5e161f43e5..8b248d4505 100644 +index f91d652bc5..86f59a2fe4 100644 @@ -148 +122 @@ -@@ -164,17 +164,17 @@ message(output_message + '\n') +@@ -163,17 +163,17 @@ message(output_message + '\n')