patch 'config/arm: fix warning for native build with meson >= 0.55' has been queued to stable release 22.11.7
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Tue Nov 12 23:07:17 CET 2024
Hi,
FYI, your patch has been queued to stable release 22.11.7
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/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://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/7c2c50cb67c1dde2e00698355c38a260d1506b19
Thanks.
Luca Boccassi
---
>From 7c2c50cb67c1dde2e00698355c38a260d1506b19 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 28 Oct 2024 13:47:43 +0100
Subject: [PATCH] config/arm: fix warning for native build with meson >= 0.55
[ upstream commit c3495563c5e13be8baf150196645bb944230c489 ]
Caught in UNH logs for native compilation on ARM:
Program /...../dpdk/config/arm/armv8_machine.py found: YES
(/...../dpdk/config/arm/armv8_machine.py)
WARNING: Project targeting '>= 0.57' but tried to use feature deprecated
since '0.55.0': ExternalProgram.path. use ExternalProgram.full_path()
instead
There is nothing to search, nor a reason to call the script with an
absolute path.
The script can be directly pointed at with files().
Fixes: 200b88cbe0e6 ("build: detect micro-arch on ARM")
Fixes: 6f3dbd306de0 ("build: increase minimum meson version to 0.57")
Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Robin Jarry <rjarry at redhat.com>
Acked-by: Chengwen Feng <fengchengwen at huawei.com>
---
config/arm/meson.build | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 5028c74613..45806d701e 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -544,9 +544,8 @@ else
# native build
# The script returns ['Implementer', 'Variant', 'Architecture',
# 'Primary Part number', 'Revision']
- detect_vendor = find_program(join_paths(meson.current_source_dir(),
- 'armv8_machine.py'))
- cmd = run_command(detect_vendor.path(), check: false)
+ detect_vendor = py3 + files('armv8_machine.py')
+ cmd = run_command(detect_vendor, check: false)
if cmd.returncode() == 0
cmd_output = cmd.stdout().to_lower().strip().split(' ')
implementer_id = cmd_output[0]
--
2.45.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-11-12 22:06:58.915594405 +0000
+++ 0007-config-arm-fix-warning-for-native-build-with-meson-0.patch 2024-11-12 22:06:58.635306699 +0000
@@ -1 +1 @@
-From c3495563c5e13be8baf150196645bb944230c489 Mon Sep 17 00:00:00 2001
+From 7c2c50cb67c1dde2e00698355c38a260d1506b19 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c3495563c5e13be8baf150196645bb944230c489 ]
+
@@ -29 +31 @@
-index 55be7c8711..95500c8ed3 100644
+index 5028c74613..45806d701e 100644
@@ -32 +34 @@
-@@ -784,9 +784,8 @@ else
+@@ -544,9 +544,8 @@ else
More information about the stable
mailing list