From 2e7250a6693337e0f98c8476fed2c57e1e2631b1 Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Thu, 2 Dec 2021 16:08:46 +0100
Subject: [PATCH] lib/env_dpdk: remove path for handling DPDK earlier than
 20.11

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>
---
 lib/env_dpdk/env.mk | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk
index 369c7a5d50..4cbcd71414 100644
--- a/lib/env_dpdk/env.mk
+++ b/lib/env_dpdk/env.mk
@@ -61,16 +61,12 @@ endif
 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_telemetry rte_kvargs
 
 ifeq ($(OS),Linux)
 DPDK_LIB_LIST += rte_power rte_ethdev rte_net
 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
 # here we add the feature specific ones and set a flag to add the common
 # ones after that.
@@ -85,21 +81,13 @@ else
 ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_crypto_aesni_mb.*))
 # PMD name for DPDK 21.08 and earlier
 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
 
 ifeq ($(CONFIG_REDUCE),y)
 DPDK_FRAMEWORK=y
-ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_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)
 DPDK_LIB_LIST += rte_common_mlx5 rte_compress_mlx5
 # Introduced in DPDK 21.08
@@ -111,16 +99,7 @@ endif
 
 ifeq ($(DPDK_FRAMEWORK),y)
 DPDK_LIB_LIST += rte_cryptodev rte_compressdev rte_bus_vdev
-ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_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
 
 LINK_HASH=n