From: Navya <navyax.bathula@intel.com>
Date: Tue, 4 Apr 2017 17:15:27 +0000 (-0700)
Subject: This patch removes the ovs kernel modules from kvmfornfv kernel
X-Git-Tag: opnfv-5.0.0~33^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kvmfornfv.git;a=commitdiff_plain;h=a5fc22463f95e071824ffa09cc9c1688434ca936

This patch removes the ovs kernel modules from kvmfornfv kernel
modules for kvmfornfv plugin build

Change-Id: I2be789c91a9dbd196da5bfde8a2d37d7dd946e8f
Signed-off-by: Navya Bathula <navyax.bathula@intel.com>
---

diff --git a/fuel-plugin/build_kvm.sh b/fuel-plugin/build_kvm.sh
index 3fc80dfb7..cc1df2791 100755
--- a/fuel-plugin/build_kvm.sh
+++ b/fuel-plugin/build_kvm.sh
@@ -3,7 +3,6 @@
 SRC=/root
 CONFIG="arch/x86/configs/opnfv.config"
 VERSION="1.0.OPNFV"
-OVS_COMMIT="4ff6642f3c1dd8949c2f42b3310ee2523ee970a6"
 
 quirks() {
 #
@@ -27,12 +26,6 @@ apt-get install -y git fakeroot build-essential ncurses-dev xz-utils kernel-pack
 #   building wouldn't remain in the source directory mapped into Docker container
 #
 cp -r /kvmfornfv $SRC/.
-cd $SRC
-
-# Get the Open VSwitch sources
-rm -rf ovs
-git clone https://github.com/openvswitch/ovs.git
-cd ovs; git checkout $OVS_COMMIT
 
 cd $SRC/kvmfornfv/
 quirks kernel
@@ -55,24 +48,5 @@ make-kpkg clean
 
 fakeroot make-kpkg --initrd --revision=$VERSION kernel_image kernel_headers
 
-# Build OVS kernel modules
-cd ../../ovs
-
-quirks ovs
-pip install six
-
-./boot.sh
-./configure --with-linux=$SRC/kvmfornfv/kernel
-make
-
-# Add OVS kernel modules to kernel deb
-dpkg-deb -x $SRC/kvmfornfv/linux-image*.deb ovs.$$
-dpkg-deb --control $SRC/kvmfornfv/linux-image*.deb ovs.$$/DEBIAN
-cp datapath/linux/*.ko ovs.$$/lib/modules/*/kernel/net/openvswitch
-depmod -b ovs.$$ -a `ls ovs.$$/lib/modules`
-dpkg-deb -b ovs.$$ $SRC/kvmfornfv/linux-image*.deb
-rm -rf ovs.$$
-
 cp $SRC/kvmfornfv/linux-headers*.deb /kvmfornfv/.
 cp $SRC/kvmfornfv/linux-image*.deb /kvmfornfv/.
-