X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel-plugin%2Fbuild_kvm.sh;h=40220b7b0559a274cebb982a18e6d5da9bf3abab;hb=c286c5ca4b5c112ed682b5a131dd04f1cc858fc6;hp=9984f3babb0c023055816bcacd22c97c91e06f3c;hpb=c715b6029fd5b4eaf323f5efde4ec5db5ba0a9b4;p=kvmfornfv.git

diff --git a/fuel-plugin/build_kvm.sh b/fuel-plugin/build_kvm.sh
index 9984f3bab..40220b7b0 100755
--- a/fuel-plugin/build_kvm.sh
+++ b/fuel-plugin/build_kvm.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-SRC=/
+SRC=/root
 CONFIG="arch/x86/configs/opnfv.config"
 VERSION="1.0.OPNFV"
-OVS_COMMIT="4ff6642f3c1dd8949c2f42b3310ee2523ee970a6"
 
 quirks() {
 #
@@ -20,14 +19,13 @@ done
 }
 
 apt-get update
-apt-get install -y git fakeroot build-essential ncurses-dev xz-utils kernel-package bc autoconf automake libtool python python-pip
+apt-get install -y git fakeroot build-essential ncurses-dev xz-utils kernel-package bc autoconf automake libtool python python-pip libssl-dev
 
-cd $SRC
-
-# Get the Open VSwitch sources
-rm -rf ovs
-git clone https://github.com/openvswitch/ovs.git
-cd ovs; git checkout $OVS_COMMIT
+#
+# Build kernel in another directory, so some files (which are root writeable only) generated during kernel
+#   building wouldn't remain in the source directory mapped into Docker container
+#
+cp -r /kvmfornfv $SRC/.
 
 cd $SRC/kvmfornfv/
 quirks kernel
@@ -48,23 +46,7 @@ make oldconfig </dev/null
 # Build the kernel debs
 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.$$
+fakeroot make-kpkg --initrd --revision=$VERSION kernel_image kernel_headers -j$(nproc)
 
+cp $SRC/kvmfornfv/linux-headers*.deb /kvmfornfv/.
+cp $SRC/kvmfornfv/linux-image*.deb /kvmfornfv/.