doc: avoid meson deprecation in setup
Subsystems (2)
PATCH 1/1 doc: avoid meson deprecation in setup
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.
--- doc/guides/cryptodevs/armv8.rst | 2 +- doc/guides/cryptodevs/uadk.rst | 2 +- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/gpus/cuda.rst | 4 ++-- doc/guides/howto/openwrt.rst | 4 ++-- 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 | 4 ++-- doc/guides/prog_guide/lto.rst | 2 +- doc/guides/prog_guide/profile_app.rst | 2 +- doc/guides/sample_app_ug/vm_power_management.rst | 14 ++++++-------- 15 files changed, 28 insertions(+), 30 deletions(-)
doc/guides/cryptodevs/armv8.rst +1 -1
@@ -47,7 +47,7 @@ To build DPDK with this virtual crypto PMD, the user is required to: .. code-block:: console - meson build + meson setup build ninja -C build The corresponding device can be created only if the following features
doc/guides/cryptodevs/uadk.rst +1 -1
@@ -87,7 +87,7 @@ Test steps cd dpdk mkdir build - meson build (--reconfigure) + meson setup build (--reconfigure) cd build ninja sudo ninja install
doc/guides/freebsd_gsg/build_dpdk.rst +1 -1
@@ -44,7 +44,7 @@ Building DPDK 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 ninja install
doc/guides/gpus/cuda.rst +2 -2
@@ -25,7 +25,7 @@ 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 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.
@@ -51,7 +51,7 @@ 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 and will return error if the application invokes the gpudev ``rte_gpu_mem_cpu_map`` function.
doc/guides/howto/openwrt.rst +2 -2
@@ -100,8 +100,8 @@ first. ar = 'x86_64-openwrt-linux-ar' strip = 'x86_64-openwrt-linux-strip' - meson builddir --cross-file openwrt-cross - ninja -C builddir + meson setup build --cross-file openwrt-cross + ninja -C build Running DPDK application on OpenWrt -----------------------------------
doc/guides/nics/ark.rst +1 -1
@@ -282,7 +282,7 @@ CFLAGS environment prior to the meson build step. I.e., .. code-block:: console export CFLAGS="-DRTE_LIBRTE_ARK_MIN_TX_PKTLEN=60" - meson build + meson setup build Supported ARK RTL PCIe Instances
doc/guides/nics/mvneta.rst +1 -1
@@ -117,7 +117,7 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable. .. code-block:: console 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
doc/guides/nics/mvpp2.rst +1 -1
@@ -133,7 +133,7 @@ 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
doc/guides/platform/bluefield.rst +2 -2
@@ -61,7 +61,7 @@ rdma-core library with corresponding kernel drivers is required. .. code-block:: console - meson build + meson setup build ninja -C build Cross Compilation
@@ -115,5 +115,5 @@ 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
doc/guides/platform/cnxk.rst +2 -2
@@ -606,14 +606,14 @@ 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 ninja -C build CN10K: .. 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 .. note::
doc/guides/platform/octeontx.rst +4 -4
@@ -94,14 +94,14 @@ drivers can be compiled with the following steps, .. code-block:: console - meson build -Dexamples=<application> + meson setup build -Dexamples=<application> ninja -C build The example applications can be compiled using the following: .. code-block:: console - meson build -Dexamples=<application> + meson setup build -Dexamples=<application> ninja -C build Cross Compilation
@@ -127,7 +127,7 @@ Now this build system can be used to build applications for **OCTEON TX** :sup:` .. code-block:: console 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 The example applications can be compiled using the following:
@@ -135,7 +135,7 @@ The example applications can be compiled using the following: .. code-block:: console 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 .. note::
doc/guides/prog_guide/build-sdk-meson.rst +2 -2
@@ -9,7 +9,7 @@ Summary For many platforms, compiling and installing DPDK should work using the following set of commands:: - meson build + meson setup build cd build ninja ninja install
@@ -57,7 +57,7 @@ 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::
doc/guides/prog_guide/lto.rst +1 -1
@@ -30,4 +30,4 @@ 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
doc/guides/prog_guide/profile_app.rst +1 -1
@@ -42,7 +42,7 @@ 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
doc/guides/sample_app_ug/vm_power_management.rst +6 -8
@@ -255,11 +255,10 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console cd dpdk - meson build - cd build - ninja + meson setup build + ninja -C build meson configure -Dexamples=vm_power_manager - ninja + ninja -C build The resulting binary is ``dpdk/build/examples/dpdk-vm_power_manager``.
@@ -494,11 +493,10 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console cd dpdk - meson build - cd build - ninja + meson setup build + ninja -C build meson configure -Dexamples=vm_power_manager/guest_cli - ninja + ninja -C build The resulting binary is ``dpdk/build/examples/guest_cli``.
Signature · 1 line
2.35.1
Quoted 15 lines · Stephen Hemminger
The command "meson build" causes a deprecation warning with meson 0.64.0.
WARNING: Running the setup command asmeson [options]instead ofmeson setup [options]is ambiguous and deprecated.Therefore fix the examples in the documentation.
Signed-off-by Stephen Hemminger <[email protected]>--- doc/guides/cryptodevs/armv8.rst | 2 +- doc/guides/cryptodevs/uadk.rst | 2 +- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/gpus/cuda.rst | 4 ++-- doc/guides/howto/openwrt.rst | 4 ++-- doc/guides/nics/ark.rst | 2 +- doc/guides/nics/mvneta.rst | 2 +- doc/guides/nics/mvpp2.rst | 2 +-
Quoted 9 lines
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 | 4 ++-- doc/guides/prog_guide/lto.rst | 2 +- doc/guides/prog_guide/profile_app.rst | 2 +- doc/guides/sample_app_ug/vm_power_management.rst | 14 ++++++-------- 15 files changed, 28 insertions(+), 30 deletions(-)
The fact that this needs to be changed in so many places is indicative that we need some cleanup in the docs - but then again, we knew that already! :-)
Quoted 26 lines · Bruce Richardson
Quoted 15 lines · Stephen Hemminger
The command "meson build" causes a deprecation warning with meson 0.64.0.
WARNING: Running the setup command asmeson [options]instead ofmeson setup [options]is ambiguous and deprecated.Therefore fix the examples in the documentation.
Signed-off-by Stephen Hemminger <[email protected]>--- doc/guides/cryptodevs/armv8.rst | 2 +- doc/guides/cryptodevs/uadk.rst | 2 +- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/gpus/cuda.rst | 4 ++-- doc/guides/howto/openwrt.rst | 4 ++-- doc/guides/nics/ark.rst | 2 +- doc/guides/nics/mvneta.rst | 2 +- doc/guides/nics/mvpp2.rst | 2 +-Quoted 9 lines
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 | 4 ++-- doc/guides/prog_guide/lto.rst | 2 +- doc/guides/prog_guide/profile_app.rst | 2 +- doc/guides/sample_app_ug/vm_power_management.rst | 14 ++++++-------- 15 files changed, 28 insertions(+), 30 deletions(-)
Quoted 6 lines
Acked-by Bruce Richardson <[email protected]>The fact that this needs to be changed in so many places is indicative that we need some cleanup in the docs - but then again, we knew that already! :-)
Indeed, and I see many places still showing the issue after the patch. Stephen, can you look at other guides?
Thanks!
Signature · 1 line
David Marchand
Quoted 6 lines · Stephen Hemminger
The command "meson build" causes a deprecation warning with meson 0.64.0.
WARNING: Running the setup command asmeson [options]instead ofmeson setup [options]is ambiguous and deprecated.Therefore fix the examples in the documentation.
Signed-off-by Stephen Hemminger <[email protected]>
Thanks Stephen
For doc/guides/cryptodevs/uadk.rst
It will be great if updating https://core.dpdk.org/doc/quick-start/ as well, here is what I learned from.
Thanks
doc/guides/cryptodevs/armv8.rst
Quoted 43 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, November 16, 2022 1:35 AM
To: [email protected]
Cc: Stephen Hemminger <[email protected]>; Ruifeng Wang <[email protected]>; Zhangfei Gao <[email protected]>; Bruce Richardson <[email protected]>; Elena Agostini <[email protected]>; Shepard Siegel <[email protected]>; Ed Czeck <[email protected]>; John Miller <[email protected]>; Zyta Szpak <[email protected]>; Liron Himi <[email protected]>; Nithin Dabilpuram <[email protected]>; Kiran Kumar K <[email protected]>; Sunil Kumar Kori <[email protected]>; Satha Rao <[email protected]>; David Hunt <[email protected]>
Subject: [PATCH] doc: avoid meson deprecation in setupThe command "meson build" causes a deprecation warning with meson 0.64.0.
WARNING:
Running the setup command asmeson [options]instead ofmeson setup [options]is ambiguous and deprecated.Therefore fix the examples in the documentation.
Signed-off-by Stephen Hemminger <[email protected]>--- doc/guides/cryptodevs/armv8.rst | 2 +- doc/guides/cryptodevs/uadk.rst | 2 +- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/gpus/cuda.rst | 4 ++-- doc/guides/howto/openwrt.rst | 4 ++-- 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 | 4 ++-- doc/guides/prog_guide/lto.rst | 2 +- doc/guides/prog_guide/profile_app.rst | 2 +- doc/guides/sample_app_ug/vm_power_management.rst | 14 ++++++-------- 15 files changed, 28 insertions(+), 30 deletions(-)doc/guides/cryptodevs/armv8.rst index renamed from doc/guides/cryptodevs/armv8.rst +0
-0
8963f66a206c..1a006754cbe4100644doc/guides/cryptodevs/armv8.rst +0
-0
Change looks good to me. Thanks.
Some occurrences in doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst need update as well.
PATCH v2 1/1 doc: avoid meson deprecation in setup
In reply to Stephen HemmingerFrom: Stephen Hemminger <[email protected]>
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.
---
Changes since v1:
- fixed commitlog,
- dropped unrelated changes (and sometimes broken),
- fixed all (I am probably too optimistic) other occurences in the doc,
--- doc/guides/cryptodevs/armv8.rst | 2 +- doc/guides/cryptodevs/bcmfs.rst | 2 +- doc/guides/cryptodevs/uadk.rst | 2 +- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/gpus/cuda.rst | 6 +-- doc/guides/howto/openwrt.rst | 2 +- doc/guides/linux_gsg/build_dpdk.rst | 8 ++-- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 12 +++--- .../cross_build_dpdk_for_loongarch.rst | 2 +- .../linux_gsg/cross_build_dpdk_for_riscv.rst | 4 +- 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 | 8 ++-- 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 +- 21 files changed, 63 insertions(+), 58 deletions(-)
doc/guides/cryptodevs/armv8.rst +1 -1
@@ -47,7 +47,7 @@ To build DPDK with this virtual crypto PMD, the user is required to: .. code-block:: console - meson build + meson setup build ninja -C build The corresponding device can be created only if the following features
doc/guides/cryptodevs/bcmfs.rst +1 -1
@@ -70,7 +70,7 @@ for cross compiling on x86 platform. .. code-block:: console 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
doc/guides/cryptodevs/uadk.rst +1 -1
@@ -87,7 +87,7 @@ Test steps cd dpdk mkdir build - meson build (--reconfigure) + meson setup build (--reconfigure) cd build ninja sudo ninja install
doc/guides/freebsd_gsg/build_dpdk.rst +1 -1
@@ -44,7 +44,7 @@ Building DPDK 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 ninja install
doc/guides/gpus/cuda.rst +3 -3
@@ -24,8 +24,8 @@ You need to indicate to meson where CUDA headers files are through the CFLAGS va 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.
@@ -51,7 +51,7 @@ 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 and will return error if the application invokes the gpudev ``rte_gpu_mem_cpu_map`` function.
doc/guides/howto/openwrt.rst +1 -1
@@ -100,7 +100,7 @@ first. ar = 'x86_64-openwrt-linux-ar' strip = 'x86_64-openwrt-linux-strip' - meson builddir --cross-file openwrt-cross + meson setup builddir --cross-file openwrt-cross ninja -C builddir Running DPDK application on OpenWrt
doc/guides/linux_gsg/build_dpdk.rst +4 -4
@@ -53,7 +53,7 @@ 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 empty or one of a number of meson or DPDK-specific build options, described
@@ -140,7 +140,7 @@ automatically built as part of a meson build too. 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. There is also a special value "all" to request that all example applications whose
@@ -166,12 +166,12 @@ The following meson command can be used on RHEL/Fedora systems to configure a 32 assuming the relevant 32-bit development packages, such as a 32-bit libc, are installed:: 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, DPDK can be compiled using ``ninja`` as described above.
doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +6 -6
@@ -167,19 +167,19 @@ Cross Compiling DPDK with GNU toolchain using Meson 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 For example if the target machine is aarch64 we can use the following command, provided the cross file has been modified accordingly:: - 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, provided the cross file has been modified accordingly:: - 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 LLVM/Clang toolchain
@@ -230,7 +230,7 @@ Assuming the file with augmented ``c_args`` and ``c_link_args`` 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 Cross Compiling DPDK with LLVM/Clang toolchain using Meson on Ubuntu 18.04
@@ -247,7 +247,7 @@ 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 Building for an aarch64 SoC on an aarch64 build machine
@@ -258,7 +258,7 @@ you don't need a separate cross toolchain, just a different set of 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
doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst +1 -1
@@ -81,7 +81,7 @@ 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 Supported cross-compilation targets
doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst +2 -2
@@ -68,13 +68,13 @@ 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 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 If riscv-gnu-toolchain is used, binary names should be updated to match. Update
doc/guides/nics/ark.rst +1 -1
@@ -282,7 +282,7 @@ CFLAGS environment prior to the meson build step. I.e., .. code-block:: console export CFLAGS="-DRTE_LIBRTE_ARK_MIN_TX_PKTLEN=60" - meson build + meson setup build Supported ARK RTL PCIe Instances
doc/guides/nics/mvneta.rst +1 -1
@@ -117,7 +117,7 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable. .. code-block:: console 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
doc/guides/nics/mvpp2.rst +1 -1
@@ -133,7 +133,7 @@ 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
doc/guides/platform/bluefield.rst +2 -2
@@ -61,7 +61,7 @@ rdma-core library with corresponding kernel drivers is required. .. code-block:: console - meson build + meson setup build ninja -C build Cross Compilation
@@ -115,5 +115,5 @@ 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
doc/guides/platform/cnxk.rst +4 -4
@@ -587,14 +587,14 @@ CN9K: .. code-block:: console - meson -Dplatform=cn9k build + meson setup -Dplatform=cn9k build ninja -C build CN10K: .. code-block:: console - meson -Dplatform=cn10k build + meson setup -Dplatform=cn10k build ninja -C build Cross Compilation
@@ -606,14 +606,14 @@ 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 ninja -C build CN10K: .. 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 .. note::
doc/guides/platform/octeontx.rst +4 -4
@@ -94,14 +94,14 @@ drivers can be compiled with the following steps, .. code-block:: console - meson build -Dexamples=<application> + meson setup build -Dexamples=<application> ninja -C build The example applications can be compiled using the following: .. code-block:: console - meson build -Dexamples=<application> + meson setup build -Dexamples=<application> ninja -C build Cross Compilation
@@ -127,7 +127,7 @@ Now this build system can be used to build applications for **OCTEON TX** :sup:` .. code-block:: console 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 The example applications can be compiled using the following:
@@ -135,7 +135,7 @@ The example applications can be compiled using the following: .. code-block:: console 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 .. note::
doc/guides/prog_guide/build-sdk-meson.rst +22 -17
@@ -9,7 +9,7 @@ Summary For many platforms, compiling and installing DPDK should work using the following set of commands:: - meson build + meson setup build cd build ninja ninja install
@@ -57,12 +57,12 @@ 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 meson.build files, and by checking the build environment for e.g. compiler
@@ -80,24 +80,29 @@ available run ``meson configure`` in the build directory. 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::
@@ -135,7 +140,7 @@ As well as those settings taken from ``meson configure``, other options 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::
@@ -188,12 +193,12 @@ Cross Compiling DPDK 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 and other build tools to be used, as well as characteristics of the target
doc/guides/prog_guide/lto.rst +1 -1
@@ -30,4 +30,4 @@ 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
doc/guides/prog_guide/profile_app.rst +2 -2
@@ -42,7 +42,7 @@ 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
@@ -103,7 +103,7 @@ 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::
doc/guides/sample_app_ug/vm_power_management.rst +2 -2
@@ -255,7 +255,7 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console cd dpdk - meson build + meson setup build cd build ninja meson configure -Dexamples=vm_power_manager
@@ -494,7 +494,7 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console cd dpdk - meson build + meson setup build cd build ninja meson configure -Dexamples=vm_power_manager/guest_cli
doc/guides/windows_gsg/build_dpdk.rst +2 -2
@@ -104,7 +104,7 @@ To compile the examples, the flag ``-Dexamples`` is required. .. code-block:: console cd C:\Users\me\dpdk - meson -Dexamples=helloworld build + meson setup -Dexamples=helloworld build ninja -C build Option 2. Cross-Compile with MinGW-w64
@@ -115,5 +115,5 @@ 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
Signature · 1 line
2.38.1
Quoted 248 lines · David Marchand
From: Stephen Hemminger <[email protected]>
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 <[email protected]>Acked-by Bruce Richardson <[email protected]>Acked-by Zhangfei Gao <[email protected]>Signed-off-by David Marchand <[email protected]>---
Changes since v1:
- fixed commitlog,
- dropped unrelated changes (and sometimes broken),
- fixed all (I am probably too optimistic) other occurences in the doc,--- doc/guides/cryptodevs/armv8.rst | 2 +- doc/guides/cryptodevs/bcmfs.rst | 2 +- doc/guides/cryptodevs/uadk.rst | 2 +- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/gpus/cuda.rst | 6 +-- doc/guides/howto/openwrt.rst | 2 +- doc/guides/linux_gsg/build_dpdk.rst | 8 ++-- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 12 +++--- .../cross_build_dpdk_for_loongarch.rst | 2 +- .../linux_gsg/cross_build_dpdk_for_riscv.rst | 4 +- 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 | 8 ++-- 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 +- 21 files changed, 63 insertions(+), 58 deletions(-)doc/guides/cryptodevs/armv8.rst +1
-1@@ -47,7 +47,7 @@ To build DPDK with this virtual crypto PMD, the user is required to: .. code-block:: console - meson build + meson setup build ninja -C build The corresponding device can be created only if the following featuresdoc/guides/cryptodevs/bcmfs.rst +1
-1@@ -70,7 +70,7 @@ for cross compiling on x86 platform. .. code-block:: console 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> ninjadoc/guides/cryptodevs/uadk.rst +1
-1@@ -87,7 +87,7 @@ Test steps cd dpdk mkdir build - meson build (--reconfigure) + meson setup build (--reconfigure) cd build ninja sudo ninja installdoc/guides/freebsd_gsg/build_dpdk.rst +1
-1@@ -44,7 +44,7 @@ Building DPDK 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 ninja installdoc/guides/gpus/cuda.rst +3
-3@@ -24,8 +24,8 @@ You need to indicate to meson where CUDA headers files are through the CFLAGS va 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.@@ -51,7 +51,7 @@ 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 and will return error if the application invokes the gpudev ``rte_gpu_mem_cpu_map`` function.doc/guides/howto/openwrt.rst +1
-1@@ -100,7 +100,7 @@ first. ar = 'x86_64-openwrt-linux-ar' strip = 'x86_64-openwrt-linux-strip' - meson builddir --cross-file openwrt-cross + meson setup builddir --cross-file openwrt-cross ninja -C builddir Running DPDK application on OpenWrtdoc/guides/linux_gsg/build_dpdk.rst +4
-4@@ -53,7 +53,7 @@ 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 empty or one of a number of meson or DPDK-specific build options, described@@ -140,7 +140,7 @@ automatically built as part of a meson build too. 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. There is also a special value "all" to request that all example applications whose@@ -166,12 +166,12 @@ The following meson command can be used on RHEL/Fedora systems to configure a 32 assuming the relevant 32-bit development packages, such as a 32-bit libc, are installed:: 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, DPDK can be compiled using ``ninja`` as described above.doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +6
-6@@ -167,19 +167,19 @@ Cross Compiling DPDK with GNU toolchain using Meson 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 For example if the target machine is aarch64 we can use the following command, provided the cross file has been modified accordingly:: - 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, provided the cross file has been modified accordingly:: - 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 LLVM/Clang toolchain@@ -230,7 +230,7 @@ Assuming the file with augmented ``c_args`` and ``c_link_args`` 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 Cross Compiling DPDK with LLVM/Clang toolchain using Meson on Ubuntu 18.04@@ -247,7 +247,7 @@ 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 Building for an aarch64 SoC on an aarch64 build machine@@ -258,7 +258,7 @@ you don't need a separate cross toolchain, just a different set of 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 SoCsdoc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst +1
-1@@ -81,7 +81,7 @@ 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 Supported cross-compilation targetsdoc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst +1
-1@@ -68,13 +68,13 @@ 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
doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst Cross Compiling DPDK with GNU toolchain using Meson · line 80
Quoted 10 lines
doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst +1
-1For 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 If riscv-gnu-toolchain is used, binary names should be updated to match. Update
Thanks for fixing this!
Signature · 2 lines
Best Regards, Stanisław Kardach
Quoted 9 lines · David Marchand
From: Stephen Hemminger <[email protected]>
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.
It can become useful in LTS branches later, hence I'm asking for backport.
Cc: [email protected]
Quoted 5 lines
Signed-off-by Stephen Hemminger <[email protected]>Acked-by Bruce Richardson <[email protected]>Acked-by Zhangfei Gao <[email protected]>Signed-off-by David Marchand <[email protected]>
Quoted 6 lines
---
Changes since v1:
- fixed commitlog,
- dropped unrelated changes (and sometimes broken),
- fixed all (I am probably too optimistic) other occurences in the doc,
I did another pass, lgtm.
Applied, thanks.
Signature · 1 line
David Marchand