From 7cf592eadc769f248830fa3e636ad7957fb910b4 Mon Sep 17 00:00:00 2001
From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Mon, 22 Jun 2015 16:42:38 +0100
Subject: src: update DPDK and OVS build to DPDK2.0.0

Update DPDK to build DPDK v2.0.0 and update OVS to link to that version
of DPDK.

Change-Id: Icc8f9fbcc7a4804a3648f0027b4ea2140888d5d1
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Mark B Kavanagh <mark.b.kavanagh@intel.com>
Reviewed-by: TV Rao <tv.rao@freescale.com>
---
 src/dpdk/Makefile   |  5 +----
 src/mk/master.mk    |  5 -----
 src/ovs/Makefile    | 11 +++++++----
 src/package-list.mk |  4 ++--
 4 files changed, 10 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 src/dpdk/Makefile
 mode change 100644 => 100755 src/ovs/Makefile

diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile
old mode 100644
new mode 100755
index 69e50328..3ca2e220
--- 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 config T=$(DPDK_TARGET) && make
+	$(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
 	@echo "Make done"
 
 install: $(INSTALL_TARGET)
@@ -70,7 +70,4 @@ $(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/mk/master.mk b/src/mk/master.mk
index 2fcb7db1..a6c4e850 100644
--- a/src/mk/master.mk
+++ b/src/mk/master.mk
@@ -25,11 +25,6 @@
 # try to read it in from environment
 INSTALL_DIR ?= $(shell echo $$INSTALL_DIR)
 
-# if it is still not set, then set it to default
-ifeq ($(INSTALL_DIR),)
-INSTALL_DIR = /opt/opnfv
-endif
-
 # for debugging Makefile
 # Make V as a synonum for VERBOSE
 ifdef V
diff --git a/src/ovs/Makefile b/src/ovs/Makefile
old mode 100644
new mode 100755
index d4acb9d3..68ac0f6d
--- a/src/ovs/Makefile
+++ b/src/ovs/Makefile
@@ -32,6 +32,11 @@ ifeq ($(DPDK_DIR),)
 DPDK_DIR = ../../dpdk/dpdk
 endif
 
+ifeq ($(DPDK_TARGET),)
+DPDK_TARGET = x86_64-native-linuxapp-gcc
+endif
+
+
 .PHONY: install force_install config force_make
 
 # install depends on make
@@ -41,10 +46,8 @@ WORK_DIR = ovs
 TAG_DONE_FLAG = $(WORK_DIR)/.$(OVS_TAG).done
 CONFIG_CMD =
 CONFIG_CMD += ./configure
-CONFIG_CMD += --with-linux=$(LINUX_BUILD)
-CONFIG_CMD += --prefix=$(INSTALL_DIR)/usr
-CONFIG_CMD += --localstatedir=$(INSTALL_DIR)/usr/local
-CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/build
+CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/$(DPDK_TARGET)
+
 
 all: force_make
 	@echo "Finished making $(WORK_DIR) "
diff --git a/src/package-list.mk b/src/package-list.mk
index 0dbdbd29..d30db146 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.8.0
+DPDK_TAG ?= v2.0.0
 
 # OVS section
 OVS_URL ?= https://github.com/openvswitch/ovs
-OVS_TAG ?= da79ce2b71dd879e7f20fdddc715568f6a74185a 
+OVS_TAG ?= master 
-- 
cgit 1.2.3-korg