3 files changed, 17 insertions, 32 deletions
diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules
index e4de1dca7..39ae3a4ec 100644
--- a/libre/vhba-module-libre/60-vhba.rules
+++ b/libre/vhba-module-libre/60-vhba.rules
@@ -1,13 +1 @@
-ACTION=="remove", GOTO="vhba_end"
-KERNEL!="vhba_ctl", GOTO="vhba_end"
-
-NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
-
-TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess"
-TAG+="udev-acl"
-GOTO="vhba_end"
-
-LABEL="vhba_uaccess"
-TAG+="uaccess"
-
-LABEL="vhba_end"
+ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess"
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index b1f8c6ffb..780c957b8 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $
+# $Id: PKGBUILD 92982 2013-06-21 09:46:01Z tpowa $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -6,9 +6,9 @@
 
 _pkgname=vhba-module
 pkgname=vhba-module-libre
-pkgver=20120422
+pkgver=20130607
 _extramodules=extramodules-3.9-LIBRE
-pkgrel=25
+pkgrel=3
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
@@ -22,28 +22,24 @@ conflicts=('vhba-module')
 provides=("vhba-module=$pkgver")
 source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
         '60-vhba.rules')
-md5sums=('d97372da1d270d1605742b2995fb6678'
-         'b5e82d0160e7a181219b67c1794d5c27')
+md5sums=('92a681e4665aa85a8335d00395a61697'
+         '4dc37dc348b5a2c83585829bde790dcc')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
+  cd $_pkgname-$pkgver
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
-
   make KDIR=/usr/lib/modules/$_kernver/build
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  install -Dm644 vhba.ko \
-    "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
-
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \
-    "$startdir/vhba-module.install"
-
-  install -Dm644 "$srcdir/60-vhba.rules" \
-	  "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+  cd $_pkgname-$pkgver
+  install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
+  install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+
+  cd $startdir
+  cp -f $install ${install}.pkg
+  true && install=${install}.pkg
+  sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 88b96f7b4..793cffd8d 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,7 @@
+EXTRAMODULES=
+
 _updatemod() {
   echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.9-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }