ip: do not clear the locally-originated flag

[vpp.git] / build / external / packages / dpdk.mk

diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk
index 286e3eb..20a7aa2 100644 (file)
--- a/build/external/packages/dpdk.mk
+++ b/build/external/packages/dpdk.mk
@@ -21,13 +21,13 @@ DPDK_MLX5_PMD                ?= n
 DPDK_TAP_PMD                 ?= n
 DPDK_FAILSAFE_PMD            ?= n
 
-DPDK_VERSION                 ?= 19.05
+DPDK_VERSION                 ?= 20.02
 DPDK_BASE_URL                ?= http://fast.dpdk.org/rel
 DPDK_TARBALL                 := dpdk-$(DPDK_VERSION).tar.xz
 DPDK_TAR_URL                 := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
 DPDK_18.11_TARBALL_MD5_CKSUM := 04b86f4a77f4f81a7fbd26467dd2ea9f
-DPDK_19.02_TARBALL_MD5_CKSUM := 23944a2cdee061aa4bd72ebe7d836db0
-DPDK_19.05_TARBALL_MD5_CKSUM := fe22ad1bab1539945119047b0fdf1105
+DPDK_19.08_TARBALL_MD5_CKSUM := 8a6f5bd844b7a06b34787063409298ed
+DPDK_20.02_TARBALL_MD5_CKSUM := e20171462d6b2252dfbae1de8c45ba10
 MACHINE=$(shell uname -m)
 
 # replace dot with space, and if 3rd word exists we deal with stable dpdk rel
@@ -182,12 +182,11 @@ $(B)/custom-config: $(B)/.dpdk-patch.ok Makefile
        $(call set,RTE_MAX_LCORE,256)
        $(call set,RTE_PKTMBUF_HEADROOM,$(DPDK_PKTMBUF_HEADROOM))
        $(call set,RTE_CACHE_LINE_SIZE,$(DPDK_CACHE_LINE_SIZE))
-       $(call set,RTE_LIBEAL_USE_HPET,y)
        $(call set,RTE_BUILD_COMBINE_LIBS,y)
        $(call set,RTE_PCI_CONFIG,y)
        $(call set,RTE_PCI_EXTENDED_TAG,"on")
        $(call set,RTE_PCI_MAX_READ_REQUEST_SIZE,4096)
-       $(call set,RTE_LIBRTE_PMD_BOND,y)
+       $(call set,RTE_LIBRTE_PMD_BOND,n)
        $(call set,RTE_LIBRTE_IP_FRAG,y)
        $(call set,RTE_LIBRTE_PMD_QAT,y)
        $(call set,RTE_LIBRTE_PMD_QAT_SYM,y)
@@ -195,6 +194,7 @@ $(B)/custom-config: $(B)/.dpdk-patch.ok Makefile
        $(call set,RTE_LIBRTE_PMD_AESNI_GCM,$(AESNI))
        $(call set,RTE_LIBRTE_MLX4_PMD,$(DPDK_MLX4_PMD))
        $(call set,RTE_LIBRTE_MLX5_PMD,$(DPDK_MLX5_PMD))
+       $(call set,RTE_LIBRTE_BNXT_PMD,y)
        $(call set,RTE_LIBRTE_PMD_SOFTNIC,n)
        $(call set,RTE_IBVERBS_LINK_DLOPEN,y)
        $(call set,RTE_LIBRTE_PMD_TAP,$(DPDK_TAP_PMD))
@@ -289,6 +289,7 @@ dpdk-config: $(B)/.dpdk-config.ok
 
 $(B)/.dpdk-build.ok: dpdk-config $(DPDK_BUILD_DEPS)
        @if [ ! -e $(B)/.dpdk-config.ok ] ; then echo 'Please run "make config" first' && false ; fi
+       @rm -f $(B)/.*.install.ok #deals with build-root/Makefile line 709
        @make $(DPDK_MAKE_ARGS) install
        @touch $@