aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Varlese <marco.varlese@suse.com>2017-08-14 16:07:00 +0200
committerSergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>2017-08-19 18:34:17 +0000
commit7ec379582d9eccb90f69102a75262ae6ebf81f8f (patch)
tree53657bc30a1014328bbd1690265efbaa2cd6eb75
parent8e0fba96e180d08d0e8ca727a68d5c8bb188bb44 (diff)
Previous version was still downloading, unpacking and building IPSEC / AES
libraries. This patch addresses the misbehaviour. Change-Id: I41f1ece3ca21c5a8f2c95533ed3d77a535233ea6 Signed-off-by: Marco Varlese <marco.varlese@suse.com>
-rw-r--r--dpdk/Makefile18
1 files changed, 12 insertions, 6 deletions
diff --git a/dpdk/Makefile b/dpdk/Makefile
index cb04a1275fa..50a90fde62f 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -33,6 +33,12 @@ DPDK_17.02_TARBALL_MD5_CKSUM := 6b9f7387c35641f4e8dbba3e528f2376
DPDK_17.05_TARBALL_MD5_CKSUM := 0a68c31cd6a6cabeed0a4331073e4c05
DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
+ifeq ($(MACHINE),$(filter $(MACHINE),x86_64))
+AESNI := y
+else
+AESNI := n
+endif
+
IPSEC_MB_VER := 0.45
AESNIMB_LIB_TARBALL := v$(IPSEC_MB_VER).tar.gz
AESNIMB_LIB_TARBALL_URL := http://github.com/01org/intel-ipsec-mb/archive/$(AESNIMB_LIB_TARBALL)
@@ -53,12 +59,6 @@ endif
MACHINE=$(shell uname -m)
-ifeq ($(MACHINE),$(filter $(MACHINE),x86_64))
-AESNI := y
-else
-AESNI := n
-endif
-
##############################################################################
# Intel x86
##############################################################################
@@ -195,11 +195,13 @@ download: $(B)/.download.ok
$(B)/.extract.ok: $(B)/.download.ok
@echo --- extracting $(DPDK_TARBALL) ---
@tar --directory $(B) --extract --file $(CURDIR)/$(DPDK_TARBALL)
+ifeq ($(AESNI),y)
@echo --- extracting $(AESNIMB_LIB_TARBALL) ---
@tar --directory $(B) --extract --file $(CURDIR)/$(AESNIMB_LIB_TARBALL)
@echo --- extracting $(ISA_L_CRYPTO_LIB_TARBALL) ---
@tar --directory $(B) --extract --file $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL)
@touch $@
+endif
.PHONY: extract
extract: $(B)/.extract.ok
@@ -225,7 +227,11 @@ $(B)/.config.ok: $(B)/.patch.ok $(B)/custom-config
config: $(B)/.config.ok
# Order matters
+ifeq ($(AESNI),y)
BUILD_TARGETS += build-ipsec-mb build-isal-crypto build-dpdk
+else
+BUILD_TARGETS += build-dpdk
+endif
.PHONY: build-ipsec-mb
build-ipsec-mb: