summaryrefslogtreecommitdiffstats
path: root/dpdk
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-03-29 22:37:02 +0200
committerGerrit Code Review <gerrit@fd.io>2016-03-29 21:25:12 +0000
commit0df78dda5ae1e1e082c2e0ea282ba5494c3d4b31 (patch)
tree5a0cc761507b69bedf055cdb5fe550eeaa3ac75f /dpdk
parent23650e6cada50246ba211cec168ddd6738a26f67 (diff)
Add DPDK 16.04-rc2 support
Can be used by specifying DPDK_VERSION=16.04-rc2 in the make command line Change-Id: I657b44d7ca22f1ef57756e7703088020fab12bc6 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'dpdk')
-rw-r--r--dpdk/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/dpdk/Makefile b/dpdk/Makefile
index e6e2b5f8700..316efc01640 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -29,6 +29,7 @@ DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.gz
DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
DPDK_2.1.0_TARBALL_MD5_CKSUM := 205a0d12bfd6eb717d57506272f43519
DPDK_2.2.0_TARBALL_MD5_CKSUM := 22e2fd68cd5504f43fe9a5a6fd6dd938
+DPDK_16.04-rc2_TARBALL_MD5_CKSUM := a642985d2694d8cf8fdfdf0723be3406
DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
DPDK_TARGET := x86_64-native-linuxapp-gcc
JOBS := $(shell grep processor /proc/cpuinfo | wc -l)
@@ -82,7 +83,7 @@ all: build
$(B)/custom-config: $(B)/.patch.ok Makefile
@echo --- generating custom config from $(DPDK_SOURCE)/config/common_linuxapp ---
- @cp $(DPDK_SOURCE)/config/common_linuxapp $@
+ @cpp -undef -ffreestanding -x assembler-with-cpp $(DPDK_SOURCE)/config/common_linuxapp $@
$(call set,RTE_MACHINE,$(DPDK_MACHINE))
$(call set,RTE_ARCH,"x86_64")
$(call set,RTE_ARCH_X86_64,y)
@@ -145,11 +146,13 @@ $(B)/.extract.ok: $(B)/.download.ok
extract: $(B)/.extract.ok
$(B)/.patch.ok: $(B)/.extract.ok
+ifneq ($(wildcard $(CURDIR)/dpdk-$(DPDK_VERSION)_patches/*.patch),)
@echo --- patching ---
for f in $(CURDIR)/dpdk-$(DPDK_VERSION)_patches/*.patch ; do \
echo Applying patch: $$(basename $$f) ; \
patch -p1 -d $(DPDK_SOURCE) < $$f ; \
done
+endif
@touch $@
.PHONY: patch