From 071071fb199833debb64625e51a4fc612e83019f Mon Sep 17 00:00:00 2001 From: Maryam Tahhan <maryam.tahhan@intel.com> Date: Mon, 27 Jul 2015 17:22:58 +0100 Subject: [PATCH] BUILD: Fix Build to allow us to verify patches Fix build so as we no longer use the HEAD of OVS master, but a specific commit and modify the DPDK build to edit the configuration file. Change-Id: I0067b53e5c5295d87b9daf49a9d1ff9e4081558e Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com> --- src/dpdk/Makefile | 7 +++++-- src/package-list.mk | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index 3ca2e220..1f4ca0ae 100755 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -42,7 +42,7 @@ all: force_make INSTALL_TARGET = force_make force_make: $(TAG_DONE_FLAG) - $(AT)cd $(WORK_DIR); make install T=$(DPDK_TARGET) CONFIG_RTE_LIBRTE_KNI=n CONFIG_RTE_LIBRTE_VHOST=y CONFIG_RTE_LIBRTE_VHOST_USER=n CONFIG_RTE_BUILD_COMBINE_LIBS=y -j + $(AT)cd $(WORK_DIR); make install T=$(DPDK_TARGET) -j @echo "Make done" install: $(INSTALL_TARGET) @@ -50,7 +50,7 @@ install: $(INSTALL_TARGET) @echo "install done" # hard way to clean and clobber -clean: +clean: cleanse clobber: $(AT)rm -rf $(WORK_DIR) @@ -70,4 +70,7 @@ $(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) + $(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 d30db146..d1015a65 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 ?= v2.0.0 +DPDK_TAG ?= d307f7957c9da6dee264ab7c9b349871c5a4c5fc # OVS section OVS_URL ?= https://github.com/openvswitch/ovs -OVS_TAG ?= master +OVS_TAG ?= 943f394ea332837d8e5285986c5182e9746c6c62 -- 2.16.6