From 5d3bd1e2038482b416a91503c2c4639bd540c09f Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Tue, 3 May 2016 15:23:38 +0800
Subject: [PATCH] Add build home and move to ubuntu

Change-Id: I35723d79269dce2a6afbb97ac81bbe093c9575a6
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 ovs_build/build-ovs-dpdk.sh     | 10 ++++++----
 ovs_build/build-ovs-nsh-dpdk.sh | 10 ++++++----
 ovs_build/build-ovs-nsh.sh      |  7 +++++--
 pre_build_hook                  |  6 +++---
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh
index 53313a5..9168f86 100755
--- a/ovs_build/build-ovs-dpdk.sh
+++ b/ovs_build/build-ovs-dpdk.sh
@@ -1,16 +1,18 @@
 #!/bin/bash
 
 DPDK_VER=2.1.0
+BUILD_HOME=`pwd`/tmp
 
 export RTE_TARGET=x86_64-native-linuxapp-gcc
-export RTE_SDK=/dpdk-${DPDK_VER}
+export RTE_SDK=${BUILD_HOME}/dpdk-${DPDK_VER}
 export DPDK_BUILD=${RTE_SDK}/${RTE_TARGET}
 
 OVS_COMMIT=121daded51b9798fe3722824b27a05c16806cbd1
 URL_OVS=https://github.com/openvswitch/ovs.git
 URL_DPDK=http://dpdk.org/browse/dpdk/snapshot/dpdk-${DPDK_VER}.tar.gz
 
-cd /
+mkdir -p ${BUILD_HOME}
+cd ${BUILD_HOME}
 wget ${URL_DPDK}
 tar -xzvf dpdk-${DPDK_VER}.tar.gz
 cd dpdk-${DPDK_VER}
@@ -20,7 +22,7 @@ sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=n/CONFIG_RTE_LIBRTE_VHOST=y/' \
        config/common_linuxapp
 make install T=${RTE_TARGET}
 
-cd /
+cd ${BUILD_HOME}
 git clone ${URL_OVS} openvswitch
 cd openvswitch
 git checkout ${OVS_COMMIT} -b development
@@ -34,4 +36,4 @@ sed -i "2iDATAPATH_CONFIGURE_OPTS='--with-dpdk=$DPDK_BUILD'" debian/rules.module
 debian/rules build
 fakeroot debian/rules binary
 
-cp /*.deb /build
+cp ${BUILD_HOME}/*.deb /deb
diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh
index 11ef6b8..3bb653c 100755
--- a/ovs_build/build-ovs-nsh-dpdk.sh
+++ b/ovs_build/build-ovs-nsh-dpdk.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
 DPDK_VER=2.1.0
+BUILD_HOME=`pwd`/tmp
 
 export RTE_TARGET=x86_64-native-linuxapp-gcc
-export RTE_SDK=/dpdk-${DPDK_VER}
+export RTE_SDK=${BUILD_HOME}/dpdk-${DPDK_VER}
 export DPDK_BUILD=${RTE_SDK}/${RTE_TARGET}
 
 OVS_COMMIT=121daded51b9798fe3722824b27a05c16806cbd1
@@ -11,7 +12,8 @@ PATCHES="060679 060680 060681 060682 060683 060684 060685"
 URL_OVS=https://github.com/openvswitch/ovs.git
 URL_DPDK=http://dpdk.org/browse/dpdk/snapshot/dpdk-${DPDK_VER}.tar.gz
 
-cd /
+mkdir -p ${BUILD_HOME}
+cd ${BUILD_HOME}
 wget ${URL_DPDK}
 tar -xzvf dpdk-${DPDK_VER}.tar.gz
 cd dpdk-${DPDK_VER}
@@ -21,7 +23,7 @@ sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=n/CONFIG_RTE_LIBRTE_VHOST=y/' \
        config/common_linuxapp
 make install T=${RTE_TARGET}
 
-cd /
+cd ${BUILD_HOME}
 git clone ${URL_OVS} openvswitch
 cd openvswitch
 git checkout ${OVS_COMMIT} -b development
@@ -38,4 +40,4 @@ sed -i "2iDATAPATH_CONFIGURE_OPTS='--with-dpdk=$DPDK_BUILD'" debian/rules.module
 debian/rules build
 fakeroot debian/rules binary
 
-cp /*.deb /build
+cp ${BUILD_HOME}/*.deb /deb
diff --git a/ovs_build/build-ovs-nsh.sh b/ovs_build/build-ovs-nsh.sh
index 34c661d..03db867 100755
--- a/ovs_build/build-ovs-nsh.sh
+++ b/ovs_build/build-ovs-nsh.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 
+BUILD_HOME=`pwd`/tmp
+
 OVS_COMMIT=121daded51b9798fe3722824b27a05c16806cbd1
 PATCHES="060679 060680 060681 060682 060683 060684 060685"
 URL_OVS=https://github.com/openvswitch/ovs.git
 
-cd /
+mkdir -p ${BUILD_HOME}
+cd ${BUILD_HOME}
 git clone ${URL_OVS} openvswitch
 cd openvswitch
 git checkout ${OVS_COMMIT} -b development
@@ -17,4 +20,4 @@ export DEB_BUILD_OPTIONS='parallel=8 nocheck'
 sed -i "s/2.4.90/2.4.90.nsh/g" debian/changelog
 debian/rules build
 fakeroot debian/rules binary
-cp /*.deb /build
+cp ${BUILD_HOME}/*.deb /deb
diff --git a/pre_build_hook b/pre_build_hook
index fc5f1b1..754e594 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -22,9 +22,9 @@ function build_pkg {
       popd
       cd ${DIR}/ovs_build
       sudo docker build -t ovs_build .
-      sudo docker run -v ${DIR}/repositories/ubuntu/ovs-nsh:/build -t  ovs_build /ovs_build/build-ovs-nsh.sh
-      sudo docker run -v ${DIR}/repositories/ubuntu/ovs-dpdk:/build -t  ovs_build /ovs_build/build-ovs-dpdk.sh
-      sudo docker run -v ${DIR}/repositories/ubuntu/ovs-nsh-dpdk:/build -t  ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
+      sudo docker run -v ${DIR}/repositories/ubuntu/:/deb -t  ovs_build /ovs_build/build-ovs-nsh.sh
+      sudo docker run -v ${DIR}/repositories/ubuntu/:/deb -t  ovs_build /ovs_build/build-ovs-dpdk.sh
+      sudo docker run -v ${DIR}/repositories/ubuntu/:/deb -t  ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
       ;;
     *) echo "Not supported system"; exit 1;;
   esac