Wed Mar 28 00:01:38 UTC 2012

3 files changed, 38 insertions, 18 deletions

diff --git a/community/vhba-module/60-vhba.rules b/community/vhba-module/60-vhba.rules
new file mode 100644
index 000000000..91de6f86a
--- /dev/null
+++ b/community/vhba-module/60-vhba.rules
@@ -0,0 +1 @@
+KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD
index 2a5a2f511..c79ca4bec 100644
--- a/community/vhba-module/PKGBUILD
+++ b/community/vhba-module/PKGBUILD
@@ -1,29 +1,42 @@
-# $Id: PKGBUILD 67390 2012-03-11 05:55:10Z schiv $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 68509 2012-03-26 09:56:23Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
 
 pkgname=vhba-module
 pkgver=20110915
 _extramodules=extramodules-3.2-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-pkgrel=4
+pkgrel=5
 pkgdesc="Kernel module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
-license=('GPL2')
+license=('GPL')
 depends=('linux>=3.2' 'linux<3.3')
 makedepends=('linux-headers>=3.2')
-install=vhba-module.install
-source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2)
-md5sums=('8bb99b427ca67bad448f4dd211bdd1a2')
+install=$pkgname.install
+source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
+        '60-vhba.rules')
+md5sums=('8bb99b427ca67bad448f4dd211bdd1a2'
+         '549bd2d9696bd1884c8eed7193c00e21')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  make -j1 KDIR=/usr/src/linux-${_kernver}
+
+  _kernver="$(cat /lib/modules/$_extramodules/version)"
+
+  make -j1 KDIR=/usr/src/linux-$_kernver
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -D vhba.ko "$pkgdir/lib/modules/${_extramodules}/vhba.ko"
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/vhba-module.install"
+
+  install -D vhba.ko "$pkgdir/lib/modules/$_extramodules/vhba.ko"
+
+  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \
+    "$startdir/vhba-module.install"
+
+  install -Dm644 "$srcdir/60-vhba.rules" \
+	  "$pkgdir/lib/udev/rules.d/60-vhba.rules"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install
index 665a1d3c5..73029498f 100644
--- a/community/vhba-module/vhba-module.install
+++ b/community/vhba-module/vhba-module.install
@@ -1,16 +1,22 @@
-post_install() {
-  echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot."
-  echo ">> This module needs to be recompiled for every kernel version upgrade."
+post_upgrade() {
+  ! grep -q 'cdemu' /etc/group && groupadd cdemu
+  echo "  > Updating module dependencies..."
   EXTRAMODULES='extramodules-3.2-ARCH'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
-post_upgrade() {
-  post_install
+
+post_install() {
+  echo "  > Adding 'cdemu' group"
+  ! grep -q 'cdemu' /etc/group && groupadd cdemu
+  echo "  > Add 'vhba' to your modules array to autoload it"
+  post_upgrade
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.2-ARCH'
-  depmod $(cat /lib/modules/$EXTRAMODULES/version)
+  post_upgrade
+  echo "Removing 'cdemu' group"
+  groupdel cdemu
 }
 
+# vim:set ts=2 sw=2 et: