patch 'build: fix reasons conflict' has been queued to stable release 22.11.5
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Thu Mar 7 02:30:32 CET 2024
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 <david.marchand at redhat.com>
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 <unknown_reason> (which is caused by a
missing reason variable set in app/graph/meson.build) and the graph
library was skipped with the same <unknown_reason> too, even though
this library meson does set a proper reason variable.
Example in GHA:
=================
Content Skipped
=================
apps:
dumpcap: not supported on Windows
graph: <unknown reason>
pdump: not supported on Windows
...
libs:
acl: not supported on Windows
bbdev: not supported on Windows
...
graph: <unknown reason>
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 <david.marchand at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
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 at 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')
More information about the stable
mailing list