ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix dpdk mellanox driver build setting

Browse Source 
- dpdk mellanox driver setting requires rdma-core.mk is included
  before dpdk.mk makefile.  Include check for rdma-core_version
  variable definition in dpdk.mk to prevent a re-occurance of this
  issue.

Type: fix
Fixes: 70522a1dc

Change-Id: I297cbd734ac7abe970eac7fb317d06b7acfc5a40
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
This commit is contained in:
Dave Wallace
2024-09-30 21:00:13 -04:00
committed by Matthew Smith
parent b2b87e4819
commit 056b7d0587
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/external/Makefile vendored
View File

@ -49,12 +49,12 @@ AARCH64=$(filter aarch64,$(shell uname -m))
include packages.mk include packages.mk
include packages/ipsec-mb.mk include packages/ipsec-mb.mk
include packages/quicly.mk include packages/quicly.mk
include packages/dpdk.mk
ifneq ($(shell uname), FreeBSD) ifneq ($(shell uname), FreeBSD)
include packages/rdma-core.mk include packages/rdma-core.mk
include packages/xdp-tools.mk include packages/xdp-tools.mk
include packages/octeon-roc.mk include packages/octeon-roc.mk
endif # ! FreeBSD endif # ! FreeBSD
include packages/dpdk.mk
.PHONY: clean .PHONY: clean
clean: clean:

3
build/external/packages/dpdk.mk vendored
View File

@ -39,6 +39,9 @@ dpdk_depends := $(if $(ARCH_X86_64), ipsec-mb)
else else
dpdk_depends := rdma-core $(if $(ARCH_X86_64), ipsec-mb) dpdk_depends := rdma-core $(if $(ARCH_X86_64), ipsec-mb)
endif endif
ifeq ($(rdma-core_version),)
$(error Missing rdma-core_version)
endif
DPDK_MLX_DEFAULT := $(shell if grep -q "rdma=$(rdma-core_version) dpdk=$(dpdk_version)" mlx_rdma_dpdk_matrix.txt; then echo 'y'; else echo 'n'; fi) DPDK_MLX_DEFAULT := $(shell if grep -q "rdma=$(rdma-core_version) dpdk=$(dpdk_version)" mlx_rdma_dpdk_matrix.txt; then echo 'y'; else echo 'n'; fi)
DPDK_MLX4_PMD ?= $(DPDK_MLX_DEFAULT) DPDK_MLX4_PMD ?= $(DPDK_MLX_DEFAULT)
DPDK_MLX5_PMD ?= $(DPDK_MLX_DEFAULT) DPDK_MLX5_PMD ?= $(DPDK_MLX_DEFAULT)