Permalink
Browse files

zfs-0.6.0_rc9-2

  • Loading branch information...
1 parent d724035 commit 3a30094772d7994d6859e24ff1941b4f5222cc04 @kylef kylef committed Jul 23, 2012
Showing with 18 additions and 13 deletions.
  1. +11 −6 zfs/PKGBUILD
  2. +7 −7 zfs/zfs.initcpio.install
View
@@ -1,10 +1,10 @@
pkgname=zfs
pkgver=0.6.0_rc9
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc="Native ZFS for Linux"
url="http://zfsonlinux.org/"
-depends=('util-linux' "spl=$pkgver-$pkgrel")
+depends=('util-linux' "spl=$pkgver-1")
makedepends=('linux-headers')
source=(http://github.com/downloads/zfsonlinux/zfs/zfs-${pkgver//_/-}.tar.gz
preempt.patch
@@ -13,21 +13,26 @@ source=(http://github.com/downloads/zfsonlinux/zfs/zfs-${pkgver//_/-}.tar.gz
md5sums=('f41082bd7073198cabf37e6e54359a07'
'9a5dc8b83c6b523fd2bd0be842278e2c'
'ca13cbbfa056847aa5a3a1479b43a066'
- 'af4deb337da54312591dbbc9b6a9380e')
+ 'c6e6369a4763ae392c7ffd38ee24fb8a')
license=('CDDL')
install=zfs.install
build() {
cd "$srcdir/$pkgname-${pkgver//_/-}"
patch -p1 -i $srcdir/preempt.patch
./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc
+ ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
make
}
package() {
cd "$srcdir/$pkgname-${pkgver//_/-}"
make DESTDIR="$pkgdir" install
- install -D -m644 zfs.initcpio.hook "$pkgdir"/lib/initcpio/hooks/zfs
- install -D -m644 zfs.initcpio.install "$pkgdir"/lib/initcpio/install/zfs
+
+ # move module tree /lib -> /usr/lib
+ cp -r "$pkgdir/lib" "$pkgdir/usr"
+ rm -r "$pkgdir/lib"
+
+ install -D -m644 "$srcdir"/zfs.initcpio.hook "$pkgdir"/usr/lib/initcpio/hooks/zfs
+ install -D -m644 "$srcdir"/zfs.initcpio.install "$pkgdir"/usr/lib/initcpio/install/zfs
}
View
@@ -3,18 +3,18 @@ build() {
BINARIES=""
FILES=""
SCRIPT="zfs"
- add_file "/lib/udev/rules.d/60-zpool.rules"
- add_file "/lib/udev/rules.d/60-zvol.rules"
- add_file "/lib/udev/rules.d/90-zfs.rules"
+ add_file "/usr/lib/udev/rules.d/60-zpool.rules"
+ add_file "/usr/lib/udev/rules.d/60-zvol.rules"
+ add_file "/usr/lib/udev/rules.d/90-zfs.rules"
add_file "/etc/zfs/zdev.conf"
- add_file "/etc/zfs/zpool.cache"
+ [ -f "/etc/zfs/zpool.cache" ] && add_file "/etc/zfs/zpool.cache"
[ -f "/etc/hostid" ] && add_file "/etc/hostid"
add_binary "/usr/sbin/zfs"
add_binary "/usr/sbin/zpool"
add_binary "/usr/bin/zpool_layout"
- add_binary "/lib/udev/zpool_id"
- add_binary "/lib/udev/zvol_id"
- add_binary "/usr/sbin/mount.zfs"
+ add_binary "/usr/lib/udev/zpool_id"
+ add_binary "/usr/lib/udev/zvol_id"
+ add_binary "/sbin/mount.zfs"
add_binary "/usr/bin/hostid"
}

0 comments on commit 3a30094

Please sign in to comment.