patch 'doc: avoid meson deprecation in setup' has been queued to stable release 21.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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/28/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/9a3294eb17e41b6a605944a4a94c6c9f57ca538e

Thanks.

Kevin

---
From 9a3294eb17e41b6a605944a4a94c6c9f57ca538e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 15 Nov 2022 09:35:16 -0800
Subject: [PATCH] doc: avoid meson deprecation in setup

[ upstream commit e24b8ad46b2124d09a97d2f9e911ba197b4f83d1 ]

The command "meson build" causes a deprecation warning with meson 0.64.0.

WARNING: Running the setup command as `meson [options]` instead of
    `meson setup [options]` is ambiguous and deprecated.

Therefore fix the examples in the documentation.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stanislaw Kardach <kda@semihalf.com>
---
 doc/guides/cryptodevs/armv8.rst               |  2 +-
 doc/guides/cryptodevs/bcmfs.rst               |  2 +-
 doc/guides/freebsd_gsg/build_dpdk.rst         |  2 +-
 doc/guides/gpus/cuda.rst                      |  4 +-
 doc/guides/howto/openwrt.rst                  |  2 +-
 doc/guides/linux_gsg/build_dpdk.rst           |  8 ++--
 .../linux_gsg/cross_build_dpdk_for_arm64.rst  | 12 +++---
 doc/guides/nics/ark.rst                       |  2 +-
 doc/guides/nics/mvneta.rst                    |  2 +-
 doc/guides/nics/mvpp2.rst                     |  2 +-
 doc/guides/platform/bluefield.rst             |  4 +-
 doc/guides/platform/cnxk.rst                  |  4 +-
 doc/guides/platform/octeontx.rst              |  8 ++--
 doc/guides/prog_guide/build-sdk-meson.rst     | 39 +++++++++++--------
 doc/guides/prog_guide/lto.rst                 |  2 +-
 doc/guides/prog_guide/profile_app.rst         |  4 +-
 .../sample_app_ug/vm_power_management.rst     |  4 +-
 doc/guides/windows_gsg/build_dpdk.rst         |  4 +-
 18 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst
index 8963f66a20..1a006754cb 100644
--- a/doc/guides/cryptodevs/armv8.rst
+++ b/doc/guides/cryptodevs/armv8.rst
@@ -48,5 +48,5 @@ To build DPDK with this virtual crypto PMD, the user is required to:
 .. code-block:: console
 
-   meson build
+   meson setup build
    ninja -C build
 
diff --git a/doc/guides/cryptodevs/bcmfs.rst b/doc/guides/cryptodevs/bcmfs.rst
index f5dcd59c87..d18a253913 100644
--- a/doc/guides/cryptodevs/bcmfs.rst
+++ b/doc/guides/cryptodevs/bcmfs.rst
@@ -71,5 +71,5 @@ for cross compiling on x86 platform.
 
     cd <DPDK-source-directory>
-    meson <dest-dir> --cross-file config/arm/arm64_stingray_linux_gcc
+    meson setup <dest-dir> --cross-file config/arm/arm64_stingray_linux_gcc
     cd <dest-dir>
     ninja
diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst
index bed353473f..f35fd29a3d 100644
--- a/doc/guides/freebsd_gsg/build_dpdk.rst
+++ b/doc/guides/freebsd_gsg/build_dpdk.rst
@@ -43,5 +43,5 @@ The following commands can be used to build and install DPDK on a system.
 The final, install, step generally needs to be run as root::
 
-  meson build
+  meson setup build
   cd build
   ninja
diff --git a/doc/guides/gpus/cuda.rst b/doc/guides/gpus/cuda.rst
index 38e22dc2c0..9c40f5a0dd 100644
--- a/doc/guides/gpus/cuda.rst
+++ b/doc/guides/gpus/cuda.rst
@@ -25,6 +25,6 @@ Three ways:
 
 - Set ``export CFLAGS=-I/usr/local/cuda/include`` before building
-- Add CFLAGS in the meson command line ``CFLAGS=-I/usr/local/cuda/include meson build``
-- Add the ``-Dc_args`` in meson command line ``meson build -Dc_args=-I/usr/local/cuda/include``
+- Add CFLAGS in the meson command line ``CFLAGS=-I/usr/local/cuda/include meson setup build``
+- Add the ``-Dc_args`` in meson command line ``meson setup build -Dc_args=-I/usr/local/cuda/include``
 
 If headers are not found, the CUDA GPU driver library is not built.
diff --git a/doc/guides/howto/openwrt.rst b/doc/guides/howto/openwrt.rst
index e1d7db2a90..be902c505f 100644
--- a/doc/guides/howto/openwrt.rst
+++ b/doc/guides/howto/openwrt.rst
@@ -101,5 +101,5 @@ first.
     strip = 'x86_64-openwrt-linux-strip'
 
-    meson builddir --cross-file openwrt-cross
+    meson setup builddir --cross-file openwrt-cross
     ninja -C builddir
 
diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst
index 0b08492ca2..2615d7b588 100644
--- a/doc/guides/linux_gsg/build_dpdk.rst
+++ b/doc/guides/linux_gsg/build_dpdk.rst
@@ -43,5 +43,5 @@ To configure a DPDK build use:
 .. code-block:: console
 
-     meson <options> build
+     meson setup <options> build
 
 where "build" is the desired output build directory, and "<options>" can be
@@ -130,5 +130,5 @@ To do so, pass a comma-separated list of the examples to build to the
 `-Dexamples` meson option as below::
 
-  meson -Dexamples=l2fwd,l3fwd build
+  meson setup -Dexamples=l2fwd,l3fwd build
 
 As with other meson options, this can also be set post-initial-config using `meson configure` in the build directory.
@@ -156,10 +156,10 @@ assuming the relevant 32-bit development packages, such as a 32-bit libc, are in
 
   PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig \
-      meson -Dc_args='-m32' -Dc_link_args='-m32' build
+      meson setup -Dc_args='-m32' -Dc_link_args='-m32' build
 
 For Debian/Ubuntu systems, the equivalent command is::
 
   PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu/pkgconfig \
-      meson -Dc_args='-m32' -Dc_link_args='-m32' build
+      meson setup -Dc_args='-m32' -Dc_link_args='-m32' build
 
 Once the build directory has been configured,
diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
index d59af58235..5cbcb67bae 100644
--- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
@@ -117,5 +117,5 @@ To cross-compile DPDK on a desired target machine we can use the following
 command::
 
-   meson cross-build --cross-file <target_machine_configuration>
+   meson setup cross-build --cross-file <target_machine_configuration>
    ninja -C cross-build
 
@@ -123,10 +123,10 @@ For example if the target machine is aarch64 we can use the following
 command::
 
-   meson aarch64-build-gcc --cross-file config/arm/arm64_armv8_linux_gcc
+   meson setup aarch64-build-gcc --cross-file config/arm/arm64_armv8_linux_gcc
    ninja -C aarch64-build-gcc
 
 If the target machine is aarch32 we can use the following command::
 
-   meson aarch32-build --cross-file config/arm/arm32_armv8_linux_gcc
+   meson setup aarch32-build --cross-file config/arm/arm32_armv8_linux_gcc
    ninja -C aarch32-build
 
@@ -179,5 +179,5 @@ is named ``arm64_armv8_linux_clang``,
 use the following command to cross-compile DPDK for the target machine::
 
-   meson aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang
+   meson setup aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang
    ninja -C aarch64-build-clang
 
@@ -196,5 +196,5 @@ On Ubuntu 18.04, these packages are needed:
 Use the following command to cross-compile DPDK for the target machine::
 
-   meson aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang_ubuntu1804
+   meson setup aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang_ubuntu1804
    ninja -C aarch64-build-clang
 
@@ -207,5 +207,5 @@ configuration options. To build for an aarch64 SoC, use the -Dplatform meson
 option::
 
-   meson soc_build -Dplatform=<target_soc>
+   meson setup soc_build -Dplatform=<target_soc>
 
 Substitute <target_soc> with one of the supported SoCs
diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index da61814b5d..7897226203 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -283,5 +283,5 @@ CFLAGS environment prior to the meson build step. I.e.,
 
     export CFLAGS="-DRTE_LIBRTE_ARK_MIN_TX_PKTLEN=60"
-    meson build
+    meson setup build
 
 
diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst
index b7f279c3cb..2ee2637a58 100644
--- a/doc/guides/nics/mvneta.rst
+++ b/doc/guides/nics/mvneta.rst
@@ -118,5 +118,5 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
 
    export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
-   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   meson setup build --cross-file config/arm/arm64_armada_linux_gcc
    ninja -C build
 
diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
index e40fed7286..cbfa47afd8 100644
--- a/doc/guides/nics/mvpp2.rst
+++ b/doc/guides/nics/mvpp2.rst
@@ -134,5 +134,5 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
    export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
 
-   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   meson setup build --cross-file config/arm/arm64_armada_linux_gcc
    ninja -C build
 
diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst
index 635e414600..e96c43c71e 100644
--- a/doc/guides/platform/bluefield.rst
+++ b/doc/guides/platform/bluefield.rst
@@ -63,5 +63,5 @@ rdma-core library with corresponding kernel drivers is required.
 .. code-block:: console
 
-        meson build
+        meson setup build
         ninja -C build
 
@@ -117,4 +117,4 @@ Then, untar the tarball at the cross toolchain directory on the x86 host.
 .. code-block:: console
 
-        meson build --cross-file config/arm/arm64_bluefield_linux_gcc
+        meson setup build --cross-file config/arm/arm64_bluefield_linux_gcc
         ninja -C build
diff --git a/doc/guides/platform/cnxk.rst b/doc/guides/platform/cnxk.rst
index 88995cc70c..149dbda09a 100644
--- a/doc/guides/platform/cnxk.rst
+++ b/doc/guides/platform/cnxk.rst
@@ -573,5 +573,5 @@ Native Compilation
 .. code-block:: console
 
-        meson build
+        meson setup build
         ninja -C build
 
@@ -583,5 +583,5 @@ Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 detail
 .. code-block:: console
 
-        meson build --cross-file config/arm/arm64_cn10k_linux_gcc
+        meson setup build --cross-file config/arm/arm64_cn10k_linux_gcc
         ninja -C build
 
diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst
index 42ddb1762e..1459dc7109 100644
--- a/doc/guides/platform/octeontx.rst
+++ b/doc/guides/platform/octeontx.rst
@@ -95,5 +95,5 @@ drivers can be compiled with the following steps,
 .. code-block:: console
 
-        meson build -Dexamples=<application>
+        meson setup build -Dexamples=<application>
         ninja -C build
 
@@ -102,5 +102,5 @@ The example applications can be compiled using the following:
 .. code-block:: console
 
-        meson build -Dexamples=<application>
+        meson setup build -Dexamples=<application>
         ninja -C build
 
@@ -128,5 +128,5 @@ Now this build system can be used to build applications for **OCTEON TX** :sup:`
 
         cd <dpdk directory>
-        meson build --cross-file config/arm/arm64_thunderx_linux_gcc
+        meson setup build --cross-file config/arm/arm64_thunderx_linux_gcc
         ninja -C build
 
@@ -136,5 +136,5 @@ The example applications can be compiled using the following:
 
         cd <dpdk directory>
-        meson build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples=<application>
+        meson setup build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples=<application>
         ninja -C build
 
diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst
index 30ce805902..b3c1517931 100644
--- a/doc/guides/prog_guide/build-sdk-meson.rst
+++ b/doc/guides/prog_guide/build-sdk-meson.rst
@@ -10,5 +10,5 @@ For many platforms, compiling and installing DPDK should work using the
 following set of commands::
 
-	meson build
+	meson setup build
 	cd build
 	ninja
@@ -58,10 +58,10 @@ Configuring the Build
 
 To configure a build, run the meson tool, passing the path to the directory
-to be used for the build e.g. ``meson build``, as shown above. If calling
+to be used for the build e.g. ``meson setup build``, as shown above. If calling
 meson from somewhere other than the root directory of the DPDK project the
 path to the root directory should be passed as the first parameter, and the
 build path as the second. For example, to build DPDK in /tmp/dpdk-build::
 
-	user@host:/tmp$ meson ~user/dpdk dpdk-build
+	user@host:/tmp$ meson setup ~user/dpdk dpdk-build
 
 Meson will then configure the build based on settings in the project's
@@ -81,22 +81,27 @@ Examples of adjusting the defaults when doing initial meson configuration.
 Project-specific options are passed used -Doption=value::
 
-	meson --werror werrorbuild  # build with warnings as errors
+	# build with warnings as errors
+	meson setup --werror werrorbuild
 
-	meson --buildtype=debug debugbuild  # build for debugging
+	# build for debugging
+	meson setup --buildtype=debug debugbuild
 
-	meson -Dexamples=l3fwd,l2fwd fwdbuild  # build some examples as
-					# part of the normal DPDK build
+	# build some examples as part of the normal DPDK build
+	meson setup -Dexamples=l3fwd,l2fwd fwdbuild
 
-	meson -Dmax_lcores=8 smallbuild  # scale build for smaller systems
+	# scale build for smaller systems
+	meson setup -Dmax_lcores=8 smallbuild
 
-	meson -Denable_docs=true fullbuild  # build and install docs
+	# build and install docs
+	meson setup -Denable_docs=true fullbuild
 
-	meson -Dcpu_instruction_set=generic  # use builder-independent baseline -march
+	# use builder-independent baseline -march
+	meson setup -Dcpu_instruction_set=generic
 
-	meson -Ddisable_drivers=event/*,net/tap  # disable tap driver and all
-					# eventdev PMDs for a smaller build
+	# disable tap driver and all eventdev PMDs for a smaller build
+	meson setup -Ddisable_drivers=event/*,net/tap
 
-	meson -Denable_trace_fp=true tracebuild # build with fast path traces
-					# enabled
+	# build with fast path traces enabled
+	meson setup -Denable_trace_fp=true tracebuild
 
 Examples of setting some of the same options using meson configure::
@@ -136,5 +141,5 @@ such as the compiler to use can be passed via environment variables. For
 example::
 
-	CC=clang meson clang-build
+	CC=clang meson setup clang-build
 
 .. note::
@@ -189,10 +194,10 @@ To cross-compile DPDK on a desired target machine we can use the following
 command::
 
-	meson cross-build --cross-file <target_machine_configuration>
+	meson setup cross-build --cross-file <target_machine_configuration>
 
 For example if the target machine is arm64 we can use the following
 command::
 
-        meson arm-build --cross-file config/arm/arm64_armv8_linux_gcc
+        meson setup arm-build --cross-file config/arm/arm64_armv8_linux_gcc
 
 where config/arm/arm64_armv8_linux_gcc contains settings for the compilers
diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst
index f79c449598..ff9f47a8f4 100644
--- a/doc/guides/prog_guide/lto.rst
+++ b/doc/guides/prog_guide/lto.rst
@@ -31,3 +31,3 @@ Link time optimization can be enabled by setting meson built-in 'b_lto' option:
 .. code-block:: console
 
-    meson build -Db_lto=true
+    meson setup build -Db_lto=true
diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst
index bd6700ef85..14292d4c25 100644
--- a/doc/guides/prog_guide/profile_app.rst
+++ b/doc/guides/prog_guide/profile_app.rst
@@ -43,5 +43,5 @@ and recompile the DPDK:
 .. code-block:: console
 
-   meson build
+   meson setup build
    meson configure build -Dc_args=-DRTE_ETHDEV_PROFILE_WITH_VTUNE
    ninja -C build
@@ -104,5 +104,5 @@ Example:
 .. code-block:: console
 
-   meson --cross config/arm/arm64_armv8_linux_gcc -Dc_args='-DRTE_ARM_EAL_RDTSC_USE_PMU' build
+   meson setup --cross config/arm/arm64_armv8_linux_gcc -Dc_args='-DRTE_ARM_EAL_RDTSC_USE_PMU' build
 
 .. warning::
diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst
index 9ce87956c9..e0af729e66 100644
--- a/doc/guides/sample_app_ug/vm_power_management.rst
+++ b/doc/guides/sample_app_ug/vm_power_management.rst
@@ -256,5 +256,5 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``:
 
    cd dpdk
-   meson build
+   meson setup build
    cd build
    ninja
@@ -495,5 +495,5 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``:
 
    cd dpdk
-   meson build
+   meson setup build
    cd build
    ninja
diff --git a/doc/guides/windows_gsg/build_dpdk.rst b/doc/guides/windows_gsg/build_dpdk.rst
index 38b3068d7b..29f2b38feb 100644
--- a/doc/guides/windows_gsg/build_dpdk.rst
+++ b/doc/guides/windows_gsg/build_dpdk.rst
@@ -105,5 +105,5 @@ To compile the examples, the flag ``-Dexamples`` is required.
 
     cd C:\Users\me\dpdk
-    meson -Dexamples=helloworld build
+    meson setup -Dexamples=helloworld build
     ninja -C build
 
@@ -116,4 +116,4 @@ Depending on the distribution, paths in this file may need adjustments.
 .. code-block:: console
 
-    meson --cross-file config/x86/cross-mingw -Dexamples=helloworld build
+    meson setup --cross-file config/x86/cross-mingw -Dexamples=helloworld build
     ninja -C build
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.450824998 +0000
+++ 0060-doc-avoid-meson-deprecation-in-setup.patch	2022-11-23 09:55:57.128149456 +0000
@@ -1 +1 @@
-From e24b8ad46b2124d09a97d2f9e911ba197b4f83d1 Mon Sep 17 00:00:00 2001
+From 9a3294eb17e41b6a605944a4a94c6c9f57ca538e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e24b8ad46b2124d09a97d2f9e911ba197b4f83d1 ]
+
@@ -13,2 +14,0 @@
-Cc: stable@dpdk.org
-
@@ -23 +22,0 @@
- doc/guides/cryptodevs/uadk.rst                |  2 +-
@@ -25 +24 @@
- doc/guides/gpus/cuda.rst                      |  6 +--
+ doc/guides/gpus/cuda.rst                      |  4 +-
@@ -29,2 +27,0 @@
- .../cross_build_dpdk_for_loongarch.rst        |  2 +-
- .../linux_gsg/cross_build_dpdk_for_riscv.rst  |  4 +-
@@ -35 +32 @@
- doc/guides/platform/cnxk.rst                  |  8 ++--
+ doc/guides/platform/cnxk.rst                  |  4 +-
@@ -42 +39 @@
- 21 files changed, 63 insertions(+), 58 deletions(-)
+ 18 files changed, 56 insertions(+), 51 deletions(-)
@@ -66,11 +62,0 @@
-diff --git a/doc/guides/cryptodevs/uadk.rst b/doc/guides/cryptodevs/uadk.rst
-index 1325eaca3f..9af6b88a5a 100644
---- a/doc/guides/cryptodevs/uadk.rst
-+++ b/doc/guides/cryptodevs/uadk.rst
-@@ -88,5 +88,5 @@ Test steps
-       cd dpdk
-       mkdir build
--      meson build (--reconfigure)
-+      meson setup build (--reconfigure)
-       cd build
-       ninja
@@ -78 +64 @@
-index d335b97cfc..514d18c870 100644
+index bed353473f..f35fd29a3d 100644
@@ -81 +67 @@
-@@ -45,5 +45,5 @@ The following commands can be used to build and install DPDK on a system.
+@@ -43,5 +43,5 @@ The following commands can be used to build and install DPDK on a system.
@@ -89 +75 @@
-index 55fc7d1e86..114e3bc8cb 100644
+index 38e22dc2c0..9c40f5a0dd 100644
@@ -101,7 +86,0 @@
-@@ -52,5 +52,5 @@ An example would be:
- .. code-block:: console
- 
--  $ meson build -Dc_args="-I/usr/local/cuda/include -I/path/to/gdrcopy/include"
-+  $ meson setup build -Dc_args="-I/usr/local/cuda/include -I/path/to/gdrcopy/include"
- 
- If headers are not found, the CUDA GPU driver library is built without the CPU map capability
@@ -120 +99 @@
-index 4f2def15ed..bbd2efc9d8 100644
+index 0b08492ca2..2615d7b588 100644
@@ -123 +102 @@
-@@ -54,5 +54,5 @@ To configure a DPDK build use:
+@@ -43,5 +43,5 @@ To configure a DPDK build use:
@@ -130 +109 @@
-@@ -141,5 +141,5 @@ To do so, pass a comma-separated list of the examples to build to the
+@@ -130,5 +130,5 @@ To do so, pass a comma-separated list of the examples to build to the
@@ -137 +116 @@
-@@ -167,10 +167,10 @@ assuming the relevant 32-bit development packages, such as a 32-bit libc, are in
+@@ -156,10 +156,10 @@ assuming the relevant 32-bit development packages, such as a 32-bit libc, are in
@@ -151 +130 @@
-index cbe9d171f8..e4de5c8d18 100644
+index d59af58235..5cbcb67bae 100644
@@ -154 +133 @@
-@@ -168,5 +168,5 @@ To cross-compile DPDK on a desired target machine we can use the following
+@@ -117,5 +117,5 @@ To cross-compile DPDK on a desired target machine we can use the following
@@ -161,2 +140,2 @@
-@@ -174,5 +174,5 @@ For example if the target machine is aarch64 we can use the following
- command, provided the cross file has been modified accordingly::
+@@ -123,10 +123,10 @@ For example if the target machine is aarch64 we can use the following
+ command::
@@ -168,2 +147 @@
-@@ -180,5 +180,5 @@ If the target machine is aarch32 we can use the following command,
- provided the cross file has been modified accordingly::
+ If the target machine is aarch32 we can use the following command::
@@ -175 +153 @@
-@@ -231,5 +231,5 @@ is named ``arm64_armv8_linux_clang``,
+@@ -179,5 +179,5 @@ is named ``arm64_armv8_linux_clang``,
@@ -182 +160 @@
-@@ -248,5 +248,5 @@ On Ubuntu 18.04, these packages are needed:
+@@ -196,5 +196,5 @@ On Ubuntu 18.04, these packages are needed:
@@ -189 +167 @@
-@@ -259,5 +259,5 @@ configuration options. To build for an aarch64 SoC, use the -Dplatform meson
+@@ -207,5 +207,5 @@ configuration options. To build for an aarch64 SoC, use the -Dplatform meson
@@ -196,29 +173,0 @@
-diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst
-index 1549cc86d5..7f75960e9e 100644
---- a/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst
-+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst
-@@ -82,5 +82,5 @@ To cross-compile DPDK for generic LoongArch we can use the following command:
- .. code-block:: console
- 
--   meson cross-build --cross-file config/loongarch/loongarch_loongarch64_linux_gcc
-+   meson setup cross-build --cross-file config/loongarch/loongarch_loongarch64_linux_gcc
-    ninja -C cross-build
- 
-diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst
-index 9e121645a8..7d7f7ac72b 100644
---- a/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst
-+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst
-@@ -69,5 +69,5 @@ Cross Compiling DPDK with GNU toolchain using Meson
- To cross-compile DPDK for a desired target machine use the following command::
- 
--   meson cross-build --cross-file <target_machine_configuration>
-+   meson setup cross-build --cross-file <target_machine_configuration>
-    ninja -C cross-build
- 
-@@ -75,5 +75,5 @@ For example if the target machine is a generic rv64gc RISC-V, use the following
- command::
- 
--   meson riscv64-build-gcc --cross-file config/riscv/riscv64_linux_gcc
-+   meson setup riscv64-build-gcc --cross-file config/riscv/riscv64_linux_gcc
-    ninja -C riscv64-build-gcc
- 
@@ -226 +175 @@
-index 591e41799c..ba00f14e80 100644
+index da61814b5d..7897226203 100644
@@ -259 +208 @@
-index 3e3078c85e..09486747b1 100644
+index 635e414600..e96c43c71e 100644
@@ -262 +211 @@
-@@ -62,5 +62,5 @@ rdma-core library with corresponding kernel drivers is required.
+@@ -63,5 +63,5 @@ rdma-core library with corresponding kernel drivers is required.
@@ -269 +218 @@
-@@ -116,4 +116,4 @@ Then, untar the tarball at the cross toolchain directory on the x86 host.
+@@ -117,4 +117,4 @@ Then, untar the tarball at the cross toolchain directory on the x86 host.
@@ -276 +225 @@
-index 562ed7d7a6..aadd60b5d4 100644
+index 88995cc70c..149dbda09a 100644
@@ -279,8 +228 @@
-@@ -588,5 +588,5 @@ CN9K:
- .. code-block:: console
- 
--        meson -Dplatform=cn9k build
-+        meson setup -Dplatform=cn9k build
-         ninja -C build
- 
-@@ -595,5 +595,5 @@ CN10K:
+@@ -573,5 +573,5 @@ Native Compilation
@@ -289,9 +231,2 @@
--        meson -Dplatform=cn10k build
-+        meson setup -Dplatform=cn10k build
-         ninja -C build
- 
-@@ -607,5 +607,5 @@ CN9K:
- .. code-block:: console
- 
--        meson build --cross-file config/arm/arm64_cn9k_linux_gcc
-+        meson setup build --cross-file config/arm/arm64_cn9k_linux_gcc
+-        meson build
++        meson setup build
@@ -300 +235 @@
-@@ -614,5 +614,5 @@ CN10K:
+@@ -583,5 +583,5 @@ Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 detail
@@ -340 +275 @@
-index 58d9b553a0..5deabbe54c 100644
+index 30ce805902..b3c1517931 100644