From patchwork Tue Nov 15 17:35:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 119871 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3E2D1A0547; Tue, 15 Nov 2022 18:35:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE9FD40F18; Tue, 15 Nov 2022 18:35:22 +0100 (CET) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mails.dpdk.org (Postfix) with ESMTP id 8BAD040E03 for ; Tue, 15 Nov 2022 18:35:20 +0100 (CET) Received: by mail-pf1-f182.google.com with SMTP id k22so14758108pfd.3 for ; Tue, 15 Nov 2022 09:35:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=r+A/KE3ZEZqPzYqgD8UX3Bep9lfZYnFHEc8OqQ8/xew=; b=Nt0+D7+1k3WD/7Bsyr/6ohOR0dtoi2VJxmPe05m8CtLXoxV7pvr9Ml1hjA3TZd4QOg HmlpWplqYHASN6S2tUrlwNBAqj1XVqClCxq0y7zWwdA8UhgbAvI6y2SFMy0J9NlXyVcd wBaFgedKtqxnp/zF9/k6ubuVVQ9S0HPahlovefIxN/ljNBoXct5W4lxsXnllX6e99H/y wVjAQOjIt5SlEFTQUeUjOOk0iCRIZ8l5zegb6r5Z4Gr34seeVO6zHcnb4xVHYFOZRtWJ dY36vb/esfhdUCqcWFRW9EkyiS1FdNDpPrdrMPLwy4CC5O3ocOHHJ2X9TyPL7WGPjfDo tBfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=r+A/KE3ZEZqPzYqgD8UX3Bep9lfZYnFHEc8OqQ8/xew=; b=7VgkYGpUrshcEilsHR0CGtIgsHHgeKBVfmauh39wJTM3psqJ17OE9To+4Vav6u7OdT DHsqPcWmhVLCBtvvUpX+E3HX7iMKCIFW+3dq9fQicttHO4PUGGp42/hcEUSGpF3va9YK lsBH9aPAr/59c+SRNjttq6H/wy4bSYK6eY4nQlV9dr75EbqqLPf8R/tqgam2W9wIdP4C HCMcZB6M/Qb092MNUpklraTBVpISz2jRZ5jTiq+JZCwpUjcWSV75I+mxwgw9inkaE9J2 +irrG8eA6Lf/aEZOKb8A7vQB4nCIp4dogMCBUkMlBtoJcaNqo5nnPL/G8IPDUuAkBlif bA2A== X-Gm-Message-State: ANoB5pmym5u0NDqCZHJOGtQHsnwzond9g0QE+vFEc5GOGhbLEz8nSAnM HT1j6ZybhTJ8LXut4EhgxV++yXgR8QfTZw== X-Google-Smtp-Source: AA0mqf6+7xXHuj2WlN7h9che5uN4rzp8Xoq3QvemeR5gCsr1qytrra1f59oxhQnDl5YQwc7JLR7e3A== X-Received: by 2002:a62:18c7:0:b0:572:725f:338d with SMTP id 190-20020a6218c7000000b00572725f338dmr3855050pfy.1.1668533719216; Tue, 15 Nov 2022 09:35:19 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id mp14-20020a17090b190e00b0020ae09e9724sm8600906pjb.53.2022.11.15.09.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 09:35:18 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Ruifeng Wang , Zhangfei Gao , Bruce Richardson , Elena Agostini , Shepard Siegel , Ed Czeck , John Miller , Zyta Szpak , Liron Himi , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , David Hunt Subject: [PATCH] doc: avoid meson deprecation in setup Date: Tue, 15 Nov 2022 09:35:16 -0800 Message-Id: <20221115173516.33051-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 Acked-by: Bruce Richardson Acked-by: Zhangfei Gao --- 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(-) diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index 8963f66a206c..1a006754cbe4 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -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 diff --git a/doc/guides/cryptodevs/uadk.rst b/doc/guides/cryptodevs/uadk.rst index 1325eaca3f0a..9af6b88a5a54 100644 --- a/doc/guides/cryptodevs/uadk.rst +++ b/doc/guides/cryptodevs/uadk.rst @@ -87,7 +87,7 @@ Test steps cd dpdk mkdir build - meson build (--reconfigure) + meson setup build (--reconfigure) cd build ninja sudo ninja install diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst index d335b97cfc1e..514d18c8700e 100644 --- a/doc/guides/freebsd_gsg/build_dpdk.rst +++ b/doc/guides/freebsd_gsg/build_dpdk.rst @@ -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 diff --git a/doc/guides/gpus/cuda.rst b/doc/guides/gpus/cuda.rst index 55fc7d1e8626..dc5b0aa603c4 100644 --- a/doc/guides/gpus/cuda.rst +++ b/doc/guides/gpus/cuda.rst @@ -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. diff --git a/doc/guides/howto/openwrt.rst b/doc/guides/howto/openwrt.rst index e1d7db2a9054..8a9155ebf457 100644 --- a/doc/guides/howto/openwrt.rst +++ b/doc/guides/howto/openwrt.rst @@ -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 ----------------------------------- diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 591e41799ca0..ba00f14e8029 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -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 diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index b7f279c3cb16..2ee2637a58f3 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -117,7 +117,7 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable. .. code-block:: console export PKG_CONFIG_PATH=$/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 e40fed72868c..cbfa47afd870 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -133,7 +133,7 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable. export PKG_CONFIG_PATH=$/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 3e3078c85e69..09486747b12f 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -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 diff --git a/doc/guides/platform/cnxk.rst b/doc/guides/platform/cnxk.rst index 562ed7d7a6cd..f2de6bb5963d 100644 --- a/doc/guides/platform/cnxk.rst +++ b/doc/guides/platform/cnxk.rst @@ -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:: diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 42ddb1762efa..1459dc7109be 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -94,14 +94,14 @@ drivers can be compiled with the following steps, .. code-block:: console - meson build -Dexamples= + meson setup build -Dexamples= ninja -C build The example applications can be compiled using the following: .. code-block:: console - meson build -Dexamples= + meson setup build -Dexamples= 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 - 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 - meson build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples= + meson setup build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples= ninja -C build .. note:: diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst index 58d9b553a0e2..c1d738e02f42 100644 --- a/doc/guides/prog_guide/build-sdk-meson.rst +++ b/doc/guides/prog_guide/build-sdk-meson.rst @@ -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:: diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst index f79c449598b0..ff9f47a8f4ee 100644 --- a/doc/guides/prog_guide/lto.rst +++ b/doc/guides/prog_guide/lto.rst @@ -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 diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst index bd6700ef850b..0aff6c18a2ae 100644 --- a/doc/guides/prog_guide/profile_app.rst +++ b/doc/guides/prog_guide/profile_app.rst @@ -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 diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst index 9ce87956c9fb..ca7d38d0dfd1 100644 --- a/doc/guides/sample_app_ug/vm_power_management.rst +++ b/doc/guides/sample_app_ug/vm_power_management.rst @@ -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``.