diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-05 12:14:43 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-05 12:14:43 -0300 |
| commit | 1a2fd51887f77ba9c41195c1a2eb9ee80ea28866 (patch) | |
| tree | 65f7f8ade72ab0e933e8be39880cb71992204e3b /community/vhba-module | |
| parent | 4e3e2f9e625584fee1cdb96fcec3a49f0cacdc8b (diff) | |
| parent | 7f6f69dc52c8601768ba48fa7b69507a80d532cb (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/wpa_supplicant/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/wine/PKGBUILD
testing/gcc/PKGBUILD
testing/glibc/PKGBUILD
testing/glibc/glibc-2.15-revert-c5a0802a.patch
testing/kmod/PKGBUILD
testing/lvm2/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/vhba-module')
| -rw-r--r-- | community/vhba-module/60-vhba.rules | 14 | ||||
| -rw-r--r-- | community/vhba-module/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/vhba-module/vhba-module.install | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/community/vhba-module/60-vhba.rules b/community/vhba-module/60-vhba.rules index 91de6f86a..e4de1dca7 100644 --- a/community/vhba-module/60-vhba.rules +++ b/community/vhba-module/60-vhba.rules @@ -1 +1,13 @@ -KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" +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" diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index feb9839ec..b867586d7 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72473 2012-06-15 09:20:59Z ibiru $ +# $Id: PKGBUILD 73199 2012-07-03 19:16:32Z dreisner $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -6,7 +6,7 @@ pkgname=vhba-module pkgver=20120422 _extramodules=extramodules-3.4-ARCH -pkgrel=1 +pkgrel=2 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" @@ -17,7 +17,7 @@ install=$pkgname.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" '60-vhba.rules') md5sums=('d97372da1d270d1605742b2995fb6678' - '549bd2d9696bd1884c8eed7193c00e21') + 'b5e82d0160e7a181219b67c1794d5c27') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index 73029498f..d9264d853 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -1,7 +1,7 @@ post_upgrade() { ! grep -q 'cdemu' /etc/group && groupadd cdemu echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.2-ARCH' + EXTRAMODULES='extramodules-3.4-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) } |