diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
| commit | 70877cfb7e290449b9f9c660e25345f462576c4c (patch) | |
| tree | 0f63651432b8448262549265a5420fff1ab665e8 /community/vhba-module | |
| parent | 509bf50c73444930b6f57c42678ec22e7de82c88 (diff) | |
| parent | 412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/performous/PKGBUILD
community/drbd/PKGBUILD
community/oss/PKGBUILD
community/pinot/PKGBUILD
core/glibc/PKGBUILD
core/kmod/PKGBUILD
core/pkg-config/PKGBUILD
core/systemd/PKGBUILD
extra/bitlbee/PKGBUILD
extra/mesa/PKGBUILD
extra/nettle/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nettle/PKGBUILD
multilib/lib32-nouveau-dri/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/zsnes/PKGBUILD
multilib/zsnes/zsnes.patch
testing/cryptsetup/PKGBUILD
testing/ekiga/PKGBUILD
testing/iputils/PKGBUILD
testing/poppler/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'community/vhba-module')
| -rw-r--r-- | community/vhba-module/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/vhba-module/vhba-module.install | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index b867586d7..89bab4a08 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73199 2012-07-03 19:16:32Z dreisner $ +# $Id: PKGBUILD 73706 2012-07-14 13:07:56Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -6,13 +6,14 @@ pkgname=vhba-module pkgver=20120422 _extramodules=extramodules-3.4-ARCH -pkgrel=2 +pkgrel=3 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL') depends=('linux>=3.4' 'linux<3.5') makedepends=('linux-headers>=3.4') +options=(!makeflags) install=$pkgname.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" '60-vhba.rules') @@ -22,15 +23,15 @@ md5sums=('d97372da1d270d1605742b2995fb6678' build() { cd "$srcdir/$pkgname-$pkgver" - _kernver="$(cat /lib/modules/$_extramodules/version)" + _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - make -j1 KDIR=/usr/src/linux-$_kernver + make KDIR=/usr/lib/modules/$_kernver/build } package() { cd "$srcdir/$pkgname-$pkgver" - install -D vhba.ko "$pkgdir/lib/modules/$_extramodules/vhba.ko" + install -D vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ "$startdir/vhba-module.install" diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index d9264d853..8458b2ae7 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -2,7 +2,7 @@ post_upgrade() { ! grep -q 'cdemu' /etc/group && groupadd cdemu echo " > Updating module dependencies..." EXTRAMODULES='extramodules-3.4-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |