aboutsummaryrefslogtreecommitdiffstats
path: root/dpdk
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-15 11:00:53 +0000
commit8ddd518f9a65af77dc3294f1965452aa72cb0eb2 (patch)
treeaa66403d69ccf3649892bf12e59920c7e7f299ba /dpdk
parentaf095513358cff48df857edee7691f242bcd9237 (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>
Diffstat (limited to 'dpdk')
-rw-r--r--dpdk/Makefile18
1 files changed, 12 insertions, 6 deletions
diff --git a/dpdk/Makefile b/dpdk/Makefile
index 2f5049e5ee4..5e947b30e21 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -34,6 +34,12 @@ DPDK_17.05_TARBALL_MD5_CKSUM := 0a68c31cd6a6cabeed0a4331073e4c05
DPDK_17.08_TARBALL_MD5_CKSUM := 0641f59ea8ea98afefa7cfa2699f6241
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)
@@ -54,12 +60,6 @@ endif
MACHINE=$(shell uname -m)
-ifeq ($(MACHINE),$(filter $(MACHINE),x86_64))
-AESNI := y
-else
-AESNI := n
-endif
-
##############################################################################
# Intel x86
##############################################################################
@@ -202,11 +202,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
@@ -232,7 +234,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: