From: Maryam Tahhan Date: Wed, 25 Mar 2015 15:37:15 +0000 (+0000) Subject: src: added mechanism to pull upstream packages and provided single top-level make X-Git-Tag: brahmaputra.1.0~177^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F174%2F6;p=vswitchperf.git src: added mechanism to pull upstream packages and provided single top-level make updated DPDK and OVS tags to build the latest Change-Id: Id1bb65a7a72d5098826d6b09bf3f73dd6d8c845f JIRA: VSPERF-25 Signed-off-by: Maryam Tahhan Reviewed-by: Gene Snider Reviewed-by: Aihua Li Reviewed-by: Aric Gardner --- diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index c6cc7bb1..4e99944b 100644 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -62,6 +62,6 @@ $(WORK_DIR): $(TAG_DONE_FLAG): $(WORK_DIR) $(AT)cd $(WORK_DIR); git checkout $(DPDK_TAG) $(AT)sed -i 's/CONFIG_RTE_BUILD_COMBINE_LIBS=n/CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE) - # KNI was causing the 1.6.0 build to fail + $(AT)sed -i 's/CONFIG_RTE_LIBRTE_VHOST=n/CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE) $(AT)sed -i 's/CONFIG_RTE_LIBRTE_KNI=y /CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE) $(AT)touch $@ diff --git a/src/package-list.mk b/src/package-list.mk index 0e64457b..0dbdbd29 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -6,8 +6,8 @@ # dpdk section # DPDK_URL ?= git://dpdk.org/dpdk DPDK_URL ?= http://dpdk.org/git/dpdk -DPDK_TAG ?= v1.6.0r0 +DPDK_TAG ?= v1.8.0 # OVS section OVS_URL ?= https://github.com/openvswitch/ovs -OVS_TAG ?= v2.3.1 +OVS_TAG ?= da79ce2b71dd879e7f20fdddc715568f6a74185a