diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/external/mlx_rdma_dpdk_matrix.txt | 2 | ||||
| -rw-r--r-- | build/external/packages/dpdk.mk | 20 | ||||
| -rw-r--r-- | build/external/packages/rdma-core.mk | 4 |
3 files changed, 18 insertions, 8 deletions
diff --git a/build/external/mlx_rdma_dpdk_matrix.txt b/build/external/mlx_rdma_dpdk_matrix.txt index a0f21c56616..b2245cc49a0 100644 --- a/build/external/mlx_rdma_dpdk_matrix.txt +++ b/build/external/mlx_rdma_dpdk_matrix.txt @@ -1,2 +1,2 @@ -rdma=46.1 dpdk=23.07 rdma=49.0 dpdk=23.11 +rdma=51.0 dpdk=24.03 diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk index 2c5a9030275..c03d1a14703 100644 --- a/build/external/packages/dpdk.mk +++ b/build/external/packages/dpdk.mk @@ -19,9 +19,10 @@ DPDK_FAILSAFE_PMD ?= n DPDK_MACHINE ?= default DPDK_MLX_IBV_LINK ?= static -dpdk_version ?= 23.11 +dpdk_version ?= 24.03 dpdk_base_url ?= http://fast.dpdk.org/rel dpdk_tarball := dpdk-$(dpdk_version).tar.xz +dpdk_tarball_md5sum_24.03 := a98da848d6ba09808ef00f9a26aaa49a dpdk_tarball_md5sum_23.11 := 896c09f5b45b452bd77287994650b916 dpdk_tarball_md5sum_23.07 := 2b6d57f077585cb15b885482362fd47f dpdk_tarball_md5sum_23.03 := 3cf8ebbcd412d5726db230f2eeb90cc9 @@ -32,8 +33,11 @@ dpdk_tarball_md5sum_21.11 := 58660bbbe9e95abce86e47692b196555 dpdk_tarball_md5sum := $(dpdk_tarball_md5sum_$(dpdk_version)) dpdk_url := $(dpdk_base_url)/$(dpdk_tarball) dpdk_tarball_strip_dirs := 1 +ifeq ($(shell uname), FreeBSD) +dpdk_depends := $(if $(ARCH_X86_64), ipsec-mb) +else dpdk_depends := rdma-core $(if $(ARCH_X86_64), ipsec-mb) - +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_MLX4_PMD ?= $(DPDK_MLX_DEFAULT) DPDK_MLX5_PMD ?= $(DPDK_MLX_DEFAULT) @@ -133,14 +137,19 @@ endif DPDK_DRIVERS_DISABLED := $(shell echo $(DPDK_DRIVERS_DISABLED) | tr -d '\\\t ') DPDK_LIBS_DISABLED := $(shell echo $(DPDK_LIBS_DISABLED) | tr -d '\\\t ') +SED=sed +ifeq ($shell(uname), FreeBSD) +SED=gsed +endif + HASH := \# # post-meson-setup snippet to alter rte_build_config.h define dpdk_config if grep -q RTE_$(1) $(dpdk_src_dir)/config/rte_config.h ; then \ -sed -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \ +$(SED) -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \ $(dpdk_src_dir)/config/rte_config.h; \ elif grep -q RTE_$(1) $(dpdk_build_dir)/rte_build_config.h ; then \ -sed -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \ +$(SED) -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \ $(dpdk_build_dir)/rte_build_config.h; \ else \ echo '$(HASH)define RTE_$(1) $(DPDK_$(1))' \ @@ -156,7 +165,7 @@ if [[ "$(DPDK_$(1))" == "y" ]]; then \ >> $(dpdk_build_dir)/rte_build_config.h ; \ fi; \ elif [[ "$(DPDK_$(1))" == "n" ]]; then \ - sed -i '/$(HASH)define RTE_$(1) .*/d' $(dpdk_build_dir)/rte_build_config.h \ + $(SED) -i '/$(HASH)define RTE_$(1) .*/d' $(dpdk_build_dir)/rte_build_config.h \ $(dpdk_src_dir)/config/rte_config.h ; \ fi endef @@ -172,6 +181,7 @@ DPDK_MESON_ARGS = \ -Db_pie=true \ -Dmachine=$(DPDK_MACHINE) \ --buildtype=$(DPDK_BUILD_TYPE) \ + -Denable_kmods=false \ ${DPDK_MLX_CONFIG_FLAG} PIP_DOWNLOAD_DIR = $(CURDIR)/downloads/ diff --git a/build/external/packages/rdma-core.mk b/build/external/packages/rdma-core.mk index e0527ce6fab..f015322775f 100644 --- a/build/external/packages/rdma-core.mk +++ b/build/external/packages/rdma-core.mk @@ -23,10 +23,10 @@ RDMA_CORE_DEBUG?=n # 2. Verify that the file build/external/dpdk_mlx_default.sh was generated # and contains 'DPDK_MLX_DEFAULT=y' # -rdma-core_version := 49.0 +rdma-core_version := 51.0 rdma-core_tarball := rdma-core-$(rdma-core_version).tar.gz -rdma-core_tarball_md5sum_46.1 := 3ac7c00717ea2720df5d90f8a43ae33a rdma-core_tarball_md5sum_49.0 := 9fe3909f19c7e0276c9e546411bbb49c +rdma-core_tarball_md5sum_51.0 := ed95d79f782ea00bd7233d453abd60b3 rdma-core_tarball_md5sum := $(rdma-core_tarball_md5sum_$(rdma-core_version)) rdma-core_tarball_strip_dirs := 1 rdma-core_url := http://github.com/linux-rdma/rdma-core/releases/download/v$(rdma-core_version)/$(rdma-core_tarball) |