From 06a7b9a7bcbf8dd3379a46c597bbfcb10ffeab9a Mon Sep 17 00:00:00 2001
From: Stu Miller
Date: Sun, 12 Feb 2012 12:04:12 -0600
Subject: system/kvm-kmod: Updated for version 3.2.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/kvm-kmod/README                | 5 ++++-
 system/kvm-kmod/fixup_udev_rules.diff | 7 +++++++
 system/kvm-kmod/kvm-kmod.SlackBuild   | 5 ++++-
 system/kvm-kmod/kvm-kmod.info         | 6 +++---
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 system/kvm-kmod/fixup_udev_rules.diff

(limited to 'system/kvm-kmod')

diff --git a/system/kvm-kmod/README b/system/kvm-kmod/README
index dc3d0cea5d..83a8145364 100644
--- a/system/kvm-kmod/README
+++ b/system/kvm-kmod/README
@@ -16,4 +16,7 @@ by Slackware.  If you uninstall KVM-KMOD, you will need to run
 'depmod -a' to regenerate the modules.dep and map files to regain 
 access to the Slackware provided versions.
 
-You need to have a "kvm" group on the system in order to use this.
+By default, this script uses the "users" group for determining who
+has permission to use /dev/kvm, but if you prefer something else,
+set KVMGROUP when running the script, e.g.:
+  KVMGROUP=wheel sh kvm-kmod.SlackBuild
diff --git a/system/kvm-kmod/fixup_udev_rules.diff b/system/kvm-kmod/fixup_udev_rules.diff
new file mode 100644
index 0000000000..24f34879e5
--- /dev/null
+++ b/system/kvm-kmod/fixup_udev_rules.diff
@@ -0,0 +1,7 @@
+diff -Nur kvm-kmod-3.2.orig/scripts/65-kvm.rules kvm-kmod-3.2/scripts/65-kvm.rules
+--- kvm-kmod-3.2.orig/scripts/65-kvm.rules	2012-01-08 07:02:08.000000000 -0600
++++ kvm-kmod-3.2/scripts/65-kvm.rules	2012-02-12 11:59:06.317519510 -0600
+@@ -1,2 +1,2 @@
+-KERNEL=="kvm", MODE="0660", GROUP="kvm"
++KERNEL=="kvm", MODE="0660", GROUP="@KVMGROUP@"
+ ACTION=="add|change", SUBSYSTEM=="dmi", KERNEL=="id", RUN+="/bin/sh -c 'grep -q vmx /proc/cpuinfo && /sbin/modprobe kvm-intel; grep -q svm /proc/cpuinfo && /sbin/modprobe kvm-amd'"
diff --git a/system/kvm-kmod/kvm-kmod.SlackBuild b/system/kvm-kmod/kvm-kmod.SlackBuild
index 4d5adcb5b3..43910221ff 100644
--- a/system/kvm-kmod/kvm-kmod.SlackBuild
+++ b/system/kvm-kmod/kvm-kmod.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kvm-kmod
-VERSION=${VERSION:-3.1}
+VERSION=${VERSION:-3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,6 +40,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 KERNEL=${KERNEL:-$(uname -r)}
+KVMGROUP=${KVMGROUP:-users}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -70,6 +71,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sed "s,@KVMGROUP@,$KVMGROUP," $CWD/fixup_udev_rules.diff | patch -p1 || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --arch=$ARCH
diff --git a/system/kvm-kmod/kvm-kmod.info b/system/kvm-kmod/kvm-kmod.info
index 4457631257..e1cd3e1561 100644
--- a/system/kvm-kmod/kvm-kmod.info
+++ b/system/kvm-kmod/kvm-kmod.info
@@ -1,8 +1,8 @@
 PRGNAM="kvm-kmod"
-VERSION="3.1"
+VERSION="3.2"
 HOMEPAGE="http://www.linux-kvm.org/page/Main_Page"
-DOWNLOAD="http://downloads.sourceforge.net/kvm/kvm-kmod-3.1.tar.bz2"
-MD5SUM="5a80316b957b4221c71af7bc1b360cb5"
+DOWNLOAD="http://downloads.sourceforge.net/kvm/kvm-kmod-3.2.tar.bz2"
+MD5SUM="6837679731b61ecccff8fa8028033f0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Stu Miller"
-- 
cgit v1.2.3