From 9aca669283c47ce7910b1bcde6c4cae941d0349f Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Sat, 16 Nov 2013 19:43:16 +0100
Subject: network/openvswitch: Updated for version 2.0.0.

Install the kernel module only if not available

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 network/openvswitch/openvswitch.SlackBuild | 13 +++++++------
 network/openvswitch/openvswitch.info       |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'network/openvswitch')

diff --git a/network/openvswitch/openvswitch.SlackBuild b/network/openvswitch/openvswitch.SlackBuild
index ac30050473..0cfd750534 100644
--- a/network/openvswitch/openvswitch.SlackBuild
+++ b/network/openvswitch/openvswitch.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openvswitch
-VERSION=${VERSION:-1.9.0}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -89,11 +89,12 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/lib/modules/${KERNEL}/kernel/extra/openvswitch
-install -m 644 datapath/linux/openvswitch.ko \
-  $PKG/lib/modules/${KERNEL}/kernel/extra/openvswitch
-install -m 644 datapath/linux/brcompat.ko \
-  $PKG/lib/modules/${KERNEL}/kernel/extra/openvswitch
+# install the kernel module only if not already available
+if [ ! -f /lib/modules/$(uname -r)/kernel/net/openvswitch/openvswitch.ko ]; then
+  mkdir -p $PKG/lib/modules/${KERNEL}/kernel/extra/openvswitch
+  install -m 644 datapath/linux/openvswitch.ko \
+    $PKG/lib/modules/${KERNEL}/kernel/extra/openvswitch
+fi
 
 mkdir -p $PKG/etc/openvswitch $PKG/etc/rc.d $PKG/var/run/openvswitch
 sed -e "s,@DOCDIR@,/usr/doc/$PRGNAM-$VERSION,g" $CWD/rc.openvswitch \
diff --git a/network/openvswitch/openvswitch.info b/network/openvswitch/openvswitch.info
index 236c893b8c..6ff583e32d 100644
--- a/network/openvswitch/openvswitch.info
+++ b/network/openvswitch/openvswitch.info
@@ -1,8 +1,8 @@
 PRGNAM="openvswitch"
-VERSION="1.9.0"
+VERSION="2.0.0"
 HOMEPAGE="http://openvswitch.org"
-DOWNLOAD="http://openvswitch.org/releases/openvswitch-1.9.0.tar.gz"
-MD5SUM="e9004202b0e10c0de9870f19d2044f11"
+DOWNLOAD="http://openvswitch.org/releases/openvswitch-2.0.0.tar.gz"
+MD5SUM="7d7a58350e634e515e0fe43c64d64f44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3-80-g2a13