This change has no impact, since -Dmachine=default gets converted by
DPDK into -Dplatform=generic (since v21.08, see the link to DPDK commit
below). Yet, switch to explicitly setting -Dplatform and avoid the
following warning:
2024-04-18T14:50:16.8001092Z config/meson.build:113: WARNING: The
"machine" option is deprecated. Please use "cpu_instruction_set"
instead.
While at it, solve another warning and call explicitly meson setup.
2024-04-18T14:50:17.0770596Z WARNING: Running the setup command as
`meson [options]` instead of `meson setup [options]` is ambiguous
and deprecated.
Link: https://git.dpdk.org/dpdk/commit/?id=bf66003b51ec
Signed-off-by: David Marchand <[email protected]>
---
.ci/dpdk-build.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.ci/dpdk-build.sh b/.ci/dpdk-build.sh
index 23f3166a54..e1b8e3ccbb 100755
--- a/.ci/dpdk-build.sh
+++ b/.ci/dpdk-build.sh
@@ -25,9 +25,9 @@ function build_dpdk()
pushd dpdk-src
fi
- # Switching to 'default' machine to make the dpdk cache usable on
+ # Switching to 'generic' platform to make the dpdk cache usable on
# different CPUs. We can't be sure that all CI machines are exactly same.
- DPDK_OPTS="$DPDK_OPTS -Dmachine=default"
+ DPDK_OPTS="$DPDK_OPTS -Dplatform=generic"
# Disable building DPDK unit tests. Not needed for OVS build or tests.
DPDK_OPTS="$DPDK_OPTS -Dtests=false"
@@ -49,7 +49,7 @@ function build_dpdk()
# Install DPDK using prefix.
DPDK_OPTS="$DPDK_OPTS --prefix=$DPDK_INSTALL_DIR"
- meson $DPDK_OPTS build
+ meson setup $DPDK_OPTS build
ninja -C build
ninja -C build install
popd
--
2.44.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
