d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/env_dpdk: remove path for handling DPDK earlier than 20.11

Browse Source 
SPDK supports only maintained LTS versions of DPDK.
For SPDK 22.01 this means DPDK 20.11 and 21.11.

This patch removes paths for earlier versions of DPDK.
There is no need to check if library is present for the following:
- rte_telemetry was added as rte_eal dependency in DPDK 20.05
- rte_kvargs was added as rte_eal dependency in DPDK 18.08
- rte_pmd_aesni_mb, rte_pmd_isal, rte_pmd_qat were removed in DPDK 20.11

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I30c4cdb0fe0634db50bc34d7d6c232806ff49960
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10525
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Tomasz Zawadzki 2021-12-02 16:08:46 +01:00
parent 7de12f13be
commit 2e7250a669
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/env_dpdk/env.mk
View File

@ -61,16 +61,12 @@ endif
DPDK_INC := -I$(DPDK_INC_DIR) DPDK_INC := -I$(DPDK_INC_DIR)
DPDK_LIB_LIST = rte_eal rte_mempool rte_ring rte_mbuf rte_bus_pci rte_pci rte_mempool_ring DPDK_LIB_LIST = rte_eal rte_mempool rte_ring rte_mbuf rte_bus_pci rte_pci rte_mempool_ring
DPDK_LIB_LIST += rte_telemetry rte_kvargs
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
DPDK_LIB_LIST += rte_power rte_ethdev rte_net DPDK_LIB_LIST += rte_power rte_ethdev rte_net
endif endif
# DPDK 20.05 eal dependency
ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_telemetry.*))
DPDK_LIB_LIST += rte_telemetry
endif
# There are some complex dependencies when using crypto, reduce or both so # 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 # here we add the feature specific ones and set a flag to add the common
# ones after that. # ones after that.
@ -85,21 +81,13 @@ else
ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_crypto_aesni_mb.*)) ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_crypto_aesni_mb.*))
# PMD name for DPDK 21.08 and earlier # PMD name for DPDK 21.08 and earlier
DPDK_LIB_LIST += rte_crypto_aesni_mb DPDK_LIB_LIST += rte_crypto_aesni_mb
else
# PMD name for DPDK 20.08 and earlier
DPDK_LIB_LIST += rte_pmd_aesni_mb
endif endif
endif endif
endif endif
ifeq ($(CONFIG_REDUCE),y) ifeq ($(CONFIG_REDUCE),y)
DPDK_FRAMEWORK=y DPDK_FRAMEWORK=y
ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_compress_isal.*))
DPDK_LIB_LIST += rte_compress_isal DPDK_LIB_LIST += rte_compress_isal
else
# PMD name for DPDK 20.08 and earlier
DPDK_LIB_LIST += rte_pmd_isal
endif
ifeq ($(CONFIG_REDUCE_MLX5),y) ifeq ($(CONFIG_REDUCE_MLX5),y)
DPDK_LIB_LIST += rte_common_mlx5 rte_compress_mlx5 DPDK_LIB_LIST += rte_common_mlx5 rte_compress_mlx5
# Introduced in DPDK 21.08 # Introduced in DPDK 21.08
@ -111,16 +99,7 @@ endif
ifeq ($(DPDK_FRAMEWORK),y) ifeq ($(DPDK_FRAMEWORK),y)
DPDK_LIB_LIST += rte_cryptodev rte_compressdev rte_bus_vdev DPDK_LIB_LIST += rte_cryptodev rte_compressdev rte_bus_vdev
ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_common_qat.*))
DPDK_LIB_LIST += rte_common_qat DPDK_LIB_LIST += rte_common_qat
else
# PMD name for DPDK 20.08 and earlier
DPDK_LIB_LIST += rte_pmd_qat
endif
endif
ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_kvargs.*))
DPDK_LIB_LIST += rte_kvargs
endif endif
LINK_HASH=n LINK_HASH=n