From 8aaec569a0cb4f51117eb5711ac096a4656bd307 Mon Sep 17 00:00:00 2001 From: paul luse Date: Thu, 20 Dec 2018 13:20:08 -0500 Subject: [PATCH] dpdk-sub: move submodule and stop building cryptodev API in makefile Addresses issues with building both compressDev and cryptoDev at the same time that we will run into shortly. We now build both API all the time but those things that have ext deps are still built only when their respective configure options are set. Change-Id: Ia4b1d4f18826a8d78c2f09881fb268a8aff61f56 Signed-off-by: paul luse Reviewed-on: https://review.gerrithub.io/437989 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Darek Stojaczyk --- dpdk | 2 +- dpdkbuild/Makefile | 2 -- lib/env_dpdk/env.mk | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dpdk b/dpdk index a8ba8524a..f112e7bac 160000 --- a/dpdk +++ b/dpdk @@ -1 +1 @@ -Subproject commit a8ba8524ac5581b424dedd46c599eeeb27a90073 +Subproject commit f112e7bacd0f2a1e4f030674e3e009473f3f0c5d diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile index 2515998fe..34d11e6f4 100644 --- a/dpdkbuild/Makefile +++ b/dpdkbuild/Makefile @@ -44,7 +44,6 @@ ifeq ($(CONFIG_CRYPTO),y) ifeq ($(TARGET_MACHINE),x86_64) CRYPTO_ENABLED = y DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y -DPDK_OPTS += CONFIG_RTE_LIBRTE_CRYPTODEV=y DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=y DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=y DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y @@ -59,7 +58,6 @@ endif ifeq ($(CRYPTO_ENABLED),n) DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=n DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n -DPDK_OPTS += CONFIG_RTE_LIBRTE_CRYPTODEV=n DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=n DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=n DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index ba956dbb3..663380963 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -80,6 +80,9 @@ endif ifeq ($(CONFIG_CRYPTO),y) DPDK_LIB_LIST += rte_cryptodev rte_reorder rte_bus_vdev rte_pmd_aesni_mb rte_pmd_qat rte_mbuf +# crypto doesn't need this lib but because of DPDK API and PMD deps, we have to include it here +# or the qat PMD won't build because we always build the compressdev API +DPDK_LIB_LIST += rte_compressdev endif ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_kvargs.*))