Date: Saturday, June 8, 2013 @ 01:56:43 Author: heftig Revision: 92539
20130607 Modified: vhba-module/trunk/60-vhba.rules vhba-module/trunk/PKGBUILD vhba-module/trunk/vhba-module.install ---------------------+ 60-vhba.rules | 14 +------------- PKGBUILD | 28 ++++++++++++---------------- vhba-module.install | 3 ++- 3 files changed, 15 insertions(+), 30 deletions(-) Modified: 60-vhba.rules =================================================================== --- 60-vhba.rules 2013-06-07 23:44:53 UTC (rev 92538) +++ 60-vhba.rules 2013-06-07 23:56:43 UTC (rev 92539) @@ -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" Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-06-07 23:44:53 UTC (rev 92538) +++ PKGBUILD 2013-06-07 23:56:43 UTC (rev 92539) @@ -4,9 +4,9 @@ # Contributor: Charles Lindsay <[email protected]> pkgname=vhba-module -pkgver=20120422 +pkgver=20130607 _extramodules=extramodules-3.9-ARCH -pkgrel=25 +pkgrel=1 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" @@ -17,28 +17,24 @@ install=$pkgname.install 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" + 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" - 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 $startdir + cp -f $install ${install}.pkg + true && install=${install}.pkg + sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install } # vim:set ts=2 sw=2 et: Modified: vhba-module.install =================================================================== --- vhba-module.install 2013-06-07 23:44:53 UTC (rev 92538) +++ vhba-module.install 2013-06-07 23:56:43 UTC (rev 92539) @@ -1,6 +1,7 @@ +EXTRAMODULES= + _updatemod() { echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.9-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) }
