summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bad1c3e..6a37268 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
# Generated by mksrcinfo v8
-# Fri May 13 13:53:05 UTC 2016
+# Sat Sep 17 17:04:44 UTC 2016
pkgbase = zfs-dkms
- pkgver = 0.6.5.7
+ pkgver = 0.6.5.8
pkgrel = 1
url = http://zfsonlinux.org/
arch = i686
arch = x86_64
license = CDDL
makedepends = git
- makedepends = spl-dkms=0.6.5.7
- source = git+https://github.com/zfsonlinux/zfs.git#tag=zfs-0.6.5.7
+ makedepends = spl-dkms=0.6.5.8
+ source = git+https://github.com/zfsonlinux/zfs.git#tag=zfs-0.6.5.8
source = zfs.bash-completion-r1
source = zfs.initcpio.install
source = zfs.initcpio.hook
@@ -20,8 +20,8 @@ pkgbase = zfs-dkms
pkgname = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
- depends = spl-dkms=0.6.5.7
- depends = zfs-utils=0.6.5.7-1
+ depends = spl-dkms=0.6.5.8
+ depends = zfs-utils=0.6.5.8-1
depends = dkms
provides = zfs
conflicts = zfs-git
diff --git a/PKGBUILD b/PKGBUILD
index 897eaca..185d498 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase="zfs-dkms"
pkgname=("zfs-dkms" "zfs-utils")
-pkgver=0.6.5.7
+pkgver=0.6.5.8
pkgrel=1
license=('CDDL')
makedepends=("git" "spl-dkms=${pkgver}")
@@ -30,7 +30,7 @@ build() {
--libdir=/usr/lib \
--datadir=/usr/share \
--includedir=/usr/include \
- --with-udevdir=/lib/udev \
+ --with-udevdir=/usr/lib/udev \
--libexecdir=/usr/lib/zfs \
--with-config=user
make
@@ -47,7 +47,8 @@ package_zfs-dkms() {
cp -a ${srcdir}/zfs/. ${dkmsdir}
cd "${dkmsdir}"
- make clean distclean
+ make clean
+ make distclean
find . -name ".git*" -print0 | xargs -0 rm -fr --
scripts/dkms.mkconf -v ${pkgver} -f dkms.conf -n zfs
chmod g-w,o-w -R .
@@ -65,10 +66,6 @@ package_zfs-utils() {
rm -r "${pkgdir}"/usr/lib/dracut
rm -r "${pkgdir}"/usr/share/initramfs-tools
- # move module tree /lib -> /usr/lib
- cp -r "${pkgdir}"/{lib,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
install -D -m644 "${srcdir}"/zfs.bash-completion-r1 "${pkgdir}"/usr/share/bash-completion/completions/zfs