From f774eaf817c6bf17ccd41587a7879c4e7cea4367 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 11 Oct 2017 15:28:58 +0200 Subject: [PATCH] devtools: rename build dependency of mlx drivers The Mellanox drivers were requiring MOFED at compilation time. It is now possible to use the upstream rdma-core package. So the dependency option is renamed in the build tool. Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core") Signed-off-by: Thomas Monjalon Acked-by: Nelio Laranjeiro --- devtools/test-build.sh | 6 +++--- doc/guides/contributing/patches.rst | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/devtools/test-build.sh b/devtools/test-build.sh index 0242d508cf..092d3a7f31 100755 --- a/devtools/test-build.sh +++ b/devtools/test-build.sh @@ -39,7 +39,7 @@ default_path=$PATH # - DPDK_DEP_ARCHIVE # - DPDK_DEP_CFLAGS # - DPDK_DEP_LDFLAGS -# - DPDK_DEP_MOFED (y/[n]) +# - DPDK_DEP_MLX (y/[n]) # - DPDK_DEP_NUMA ([y]/n) # - DPDK_DEP_PCAP (y/[n]) # - DPDK_DEP_SSL (y/[n]) @@ -122,7 +122,7 @@ reset_env () unset DPDK_DEP_ARCHIVE unset DPDK_DEP_CFLAGS unset DPDK_DEP_LDFLAGS - unset DPDK_DEP_MOFED + unset DPDK_DEP_MLX unset DPDK_DEP_NUMA unset DPDK_DEP_PCAP unset DPDK_DEP_SSL @@ -169,7 +169,7 @@ config () # sed -ri 's,(BYPASS=)n,\1y,' $1/.config test "$DPDK_DEP_ARCHIVE" != y || \ sed -ri 's,(RESOURCE_TAR=)n,\1y,' $1/.config - test "$DPDK_DEP_MOFED" != y || \ + test "$DPDK_DEP_MLX" != y || \ sed -ri 's,(MLX._PMD=)n,\1y,' $1/.config test "$DPDK_DEP_SZE" != y || \ sed -ri 's,(PMD_SZEDATA2=)n,\1y,' $1/.config diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 27e218b247..446dfc7328 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -367,7 +367,6 @@ The builds can be modified via the following environmental variables: * ``DPDK_BUILD_TEST_CONFIGS`` (target1+option1+option2 target2) * ``DPDK_DEP_CFLAGS`` * ``DPDK_DEP_LDFLAGS`` -* ``DPDK_DEP_MOFED`` (y/[n]) * ``DPDK_DEP_PCAP`` (y/[n]) * ``DPDK_NOTIFY`` (notify-send) -- 2.20.1