From d3e1aa05db24ccd65bafbff8ad6a6d0e6c310d8d Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Mon, 25 May 2020 15:03:12 +0200 Subject: [PATCH] dpdkbuild: add support for DPDK 20.05 EAL got a new dependency in 20.05: rte_telemetry. Change-Id: I43df7afe9a84e88f034a7f87fc6a299f0bbd8bac Signed-off-by: Darek Stojaczyk Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2590 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Shuhei Matsumoto Reviewed-by: Aleksey Marchuk Reviewed-by: Ben Walker --- lib/env_dpdk/env.mk | 5 +++++ mk/spdk.nvmecli.mk | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index 5f21a839d..9410e3ae9 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -78,6 +78,11 @@ ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_bus_pci.*)) DPDK_LIB_LIST += rte_bus_pci endif +# DPDK 20.05 eal dependency +ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_telemetry.*)) +DPDK_LIB_LIST += rte_telemetry +endif + # There are some complex dependencies when using crypto, reduce or both so # here we add the feature specific ones and set a flag to add the common # ones after that. diff --git a/mk/spdk.nvmecli.mk b/mk/spdk.nvmecli.mk index 06725aba8..eb04a71a3 100644 --- a/mk/spdk.nvmecli.mk +++ b/mk/spdk.nvmecli.mk @@ -47,6 +47,10 @@ ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_power.*)) DPDK_LIB_LIST += -lrte_power endif +ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_telemetry.*)) +DPDK_LIB_LIST += -lrte_telemetry +endif + NVMECLI_SPDK_LIBS = -lspdk_log -lspdk_sock -lspdk_nvme -lspdk_env_dpdk -lspdk_util -lspdk_jsonrpc -lspdk_json -lspdk_rpc ifeq ($(CONFIG_RDMA),y)