X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fbuild_ovs_rpm.sh;h=0972dd90d6a94ebf91e5f825e1bb96f2c7abaec8;hb=3e734f87b920bd8d61c09f3904d7bbdf73cd53bc;hp=b03f4abaadcbf4e94f0e8c8582711f01be9eeb41;hpb=4e07dd488cb78b8333763418c4ccc25e05766956;p=ovsnfv.git

diff --git a/build/build_ovs_rpm.sh b/build/build_ovs_rpm.sh
index b03f4ab..0972dd9 100755
--- a/build/build_ovs_rpm.sh
+++ b/build/build_ovs_rpm.sh
@@ -16,27 +16,11 @@
 set -e
 
 echo "==============================="
-echo executing $0 $@
-echo executing on machine `uname -a`
+echo "executing $0 $@"
+echo "executing on machine `uname -a`"
 
 usage() {
-    echo run BuildAndTestOVS -h for help
-}
-
-function delrpm() {
-    set +e
-    rpm -q $1
-    if [ $? -eq 0 ]; then
-        sudo rpm -e --allmatches $1
-    fi
-    set -e
-}
-function cleanrpms() {
-    delrpm openvswitch
-    delrpm dpdk-devel
-    delrpm dpdk-tools
-    delrpm dpdk-examples
-    delrpm dpdk
+    echo "run BuildAndTestOVS -h for help"
 }
 
 while getopts "cdg:hkp:u:v" opt; do
@@ -73,20 +57,44 @@ HOME=`pwd`
 TOPDIR=$HOME
 TMPDIR=$TOPDIR/ovsrpm
 
+BUILDDIR=$HOME
+BUILD_BASE=$BUILDDIR
+
+source $BUILDDIR/functions.sh
+
 echo "---------------------------------------"
-echo Clean out old working dir
+echo "Clean out old working dir."
 echo
 if [ -d $TMPDIR ]
 then
     rm -rf $TMPDIR
 fi
 
-echo "----------------------------------------"
-echo Install pre-reqs.
-echo
-sudo yum -y install gcc make python-devel openssl-devel kernel-devel graphviz \
-       kernel-debug-devel autoconf automake rpm-build redhat-rpm-config \
-       libtool python-twisted-core desktop-file-utils groff PyQt4
+function install_pre_reqs() {
+    echo "----------------------------------------"
+    echo "Install pre-reqs."
+    echo
+    sudo yum -y install gcc make python-devel openssl-devel kernel-devel graphviz \
+                kernel-debug-devel autoconf automake rpm-build redhat-rpm-config \
+                libtool python-twisted-core desktop-file-utils groff PyQt4
+}
+function apply_nsh_patches() {
+    echo "-------------------------------------------"
+    echo "Clone NSH patch and copy patch files."
+    echo
+    cd $TMPDIR
+    if [ -e ovs_nsh_patches ]; then
+        rm -rf ovs_nsh_patches
+    fi
+    git clone https://github.com/yyang13/ovs_nsh_patches.git
+    cp $TMPDIR/ovs_nsh_patches/*.patch $RPMDIR/SOURCES
+    cd $TMPDIR
+    if [ -e buildovsnsh ]; then
+        rm -rf buildovsnsh
+    fi
+    git clone https://github.com/tfherbert/buildovsnsh.git
+    cp buildovsnsh/*.spec $BUILDDIR
+}
 
 VERSION=2.3.90
 os_type=fedora
@@ -95,7 +103,7 @@ kernel_version=$(uname -a | awk '{print $3}')
 RPMDIR=$HOME/rpmbuild
 
 echo "---------------------------------------"
-echo Clean out old reminents of old rpms and rpm _topdir.
+echo "Clean out old reminents of old rpms and rpm _topdir."
 echo
 
 rm openvswitch*.rpm || true
@@ -104,7 +112,7 @@ if [  -d $RPMDIR ]; then
 fi
 
 echo "---------------------------------------"
-echo Create new rpm _topdir.
+echo "Create new rpm _topdir."
 echo
 mkdir -p $HOME/rpmbuild/RPMS
 mkdir -p $HOME/rpmbuild/SOURCES
@@ -114,6 +122,8 @@ mkdir -p $HOME/rpmbuild/SRPMS
 
 mkdir -p $TMPDIR
 
+install_pre_reqs
+
 cd $TMPDIR
 
 if [ ! -z $DPDK ]; then
@@ -123,14 +133,15 @@ if [ ! -z $DPDK ]; then
     echo "----------------------------------"
     echo "Clone Fedora copr repo and copy files."
     echo
-    git clone https://github.com/tfherbert/ovs-snap.git 
+    git clone https://github.com/tfherbert/ovs-snap.git
     cd ovs-snap
     git checkout $COPR_OVS_VERSION
+    echo "-----------------------------------"
     cp $TMPDIR/ovs-snap/openvswitch.spec $RPMDIR/SPECS
     cp $TMPDIR/ovs-snap/* $RPMDIR/SOURCES
     snapgit=`grep "define snapver" $TMPDIR/ovs-snap/openvswitch.spec | cut -c26-33`
-    echo "-------------------------------------------"
-    echo "Remove old dpdk, ovs and dpdk development rpms"
+    echo "-----------------------------------------------"
+    echo "Remove any old installed ovs and dpdk rpms."
     echo
     cleanrpms
 
@@ -165,49 +176,113 @@ if [ ! -z $DPDK ]; then
     echo "--------------------------------------------"
     echo "Build openvswitch RPM"
     echo
+    rpmbuild -bb -vv --define "_topdir `echo $RPMDIR`" $setnocheck openvswitch.spec
 else
     echo "-------------------------------------------------"
     echo "Build OVS without DPDK:"
     echo "Use spec files for $os_type in OVS distribution."
     echo
-    if [[ "$TAG" =~ "master" ]]; then
-        git clone $OVS_REPO_URL
-        cd ovs
-
-        if [[ ! "$OVS_PATCH" =~ "no" ]]; then
-            echo "Apply patches from $OVS_PATCH"
-        fi
-        basever=`grep AC_INIT configure.ac | cut -d' ' -f2 | cut -d, -f1`
-        export VERSION=$basever
+    echo "-------------------------------------------"
+    echo "Remove old rpms."
+    echo
+    cleanrpms
+    cd $TMPDIR
+    git clone $OVS_REPO_URL
+    cd $TMPDIR/ovs
+    git checkout $OVS_VERSION
+    echo "--------------------------------------------"
+    echo "Get commit from $snapgit User Space OVS version $TAG"
+    echo
+    snapgit=`git log --pretty=oneline -n1|cut -c1-8`
+    snapser=`git log --pretty=oneline | wc -l`
+    basever=`grep AC_INIT configure.ac | cut -d' ' -f2 | cut -d, -f1`
+    prefix=openvswitch-${basever}
+    snapver=${snapser}.NSH${snapgit}
+    archive=${prefix}-${snapser}.NSH${snapgit}.tar.gz
 
-        echo "--------------------------------------------"
-        echo making distribution tarball for Open vswitch version $VERSION
-        echo
-        ./boot.sh
-        ./configure
-        make dist
-
-        echo cp openvswitch-*.tar.gz $HOME/rpmbuild/SOURCES
-        cp openvswitch-*.tar.gz $HOME/rpmbuild/SOURCES
-    else
-        export VERSION=${TAG}
-        echo "---------------------------------------------"
-        echo "Get openvswith-${VERSION}.tar.gz"
+    if [ ! -z $OVS_PATCH ]; then
+        echo "-------------------------------------------"
+        echo "Apply OVS patches."
         echo
-        curl --silent --output $HOME/rpmbuild/SOURCES/openvswitch-${VERSION}.tar.gz http://openvswitch.org/releases/openvswitch-${VERSION}.tar.gz
+        apply_nsh_patches
+    fi
+
+    echo "----------------------------------"
+    echo "Create dist name and rpm name. Put $snapver into spec file"
+    echo
+    cd $BUILD_BASE
+    sed -i "s/%define snapver.*/%define snapver ${snapver}/" openvswitch.spec
+    echo "----------------------------------"
+    echo "Copy spec file."
+    echo
+    cp $BUILD_BASE/openvswitch.spec $RPMDIR/SPECS
+    cp $BUILD_BASE/openvswitch.spec $RPMDIR/SOURCES
+    echo "--------------------------------------------"
+    echo "Creating snapshot, $archive with name same as in spec file."
+    echo
+    cd $TMPDIR/ovs
+    git archive --prefix=${prefix}-${snapser}.NSH${snapgit}/ HEAD  | gzip -9 > $RPMDIR/SOURCES/${archive}
+    echo "--------------------------------------------"
+    echo "Build openvswitch RPM"
+    echo
+    cd $BUILD_BASE
+    rpmbuild -bb -vv --without dpdk --define "_topdir `echo $RPMDIR`" $setnocheck openvswitch.spec
+fi
+#
+# This section is for building OVS kernel module.
+#
+if [ ! -z $kmod ]; then
+    echo "--------------------------------------------"
+    echo Build Open vswitch kernel module
+    echo
+    cd $TMPDIR
+    if [ -e ovs ]; then
+        rm -rf ovs
     fi
+    git clone $OVS_REPO_URL
+    cd $TMPDIR/ovs
+    git checkout $OVS_VERSION
+    echo "--------------------------------------------"
+    echo "Get commit from $snapgit User Space OVS version $TAG"
+    echo
+    snapgit=`git log --pretty=oneline -n1|cut -c1-8`
+    snapser=`git log --pretty=oneline | wc -l`
+    basever=`grep AC_INIT configure.ac | cut -d' ' -f2 | cut -d, -f1`
+    prefix=openvswitch-kmod-${basever}
+    snapver=${snapser}.NSH${snapgit}
+    archive=${prefix}-${snapser}.NSH${snapgit}.tar.gz
 
-    if [ ! -z $kmod ]; then
-        echo "--------------------------------------------"
-        echo "Building openvswitch kernel module RPM"
+    if [ ! -z $OVS_PATCH ]; then
+        echo "-------------------------------------------"
+        echo "Apply OVS patches."
         echo
-        rpmbuild -bb -D "kversion $kernel_version" -D "kflavors default" --define "_topdir `echo $RPMDIR`" $setnocheck rhel/openvswitch-kmod-${os_type}.spec
+        apply_nsh_patches
     fi
+    echo "----------------------------------"
+    echo "Create dist name and rpm name. Put $snapver into spec file"
+    echo
+    cd $BUILD_BASE
+    sed -i "s/%define snapver.*/%define snapver ${snapver}/" openvswitch-kmod.spec
+    echo "----------------------------------"
+    echo "Copy spec file."
+    echo
+    cp $BUILD_BASE/openvswitch-kmod.spec $RPMDIR/SPECS
+    cp $BUILD_BASE/openvswitch-kmod.spec $RPMDIR/SOURCES
+    echo "-------------------------------------------"
+    echo "Apply nsh patches."
+    echo
+    apply_nsh_patches
     echo "--------------------------------------------"
-    echo "Build openvswitch RPM"
+    echo "Creating snapshot, $archive with name same as in spec file."
+    echo
+    cd $TMPDIR/ovs
+    git archive --prefix=${prefix}-${snapser}.NSH${snapgit}/ HEAD  | gzip -9 > $RPMDIR/SOURCES/${archive}
+    echo "--------------------------------------------"
+    echo "Building openvswitch kernel module RPM"
     echo
+    cd $BUILD_BASE
+    rpmbuild -bb -vv -D "kversion $kernel_version" -D "kflavors default" --define "_topdir `echo $RPMDIR`" $setnocheck openvswitch-kmod.spec
 fi
-rpmbuild -bb --define "_topdir `echo $RPMDIR`" $setnocheck openvswitch.spec
 
 cp $RPMDIR/RPMS/x86_64/*.rpm $HOME