summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--zfs.install4
3 files changed, 10 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 32b08a00dfe..260db9ddfeb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = zfs-dkms
- pkgver = 0.6.4.2
+ pkgver = 0.6.5.2
pkgrel = 1
url = http://zfsonlinux.org/
arch = i686
@@ -18,8 +18,8 @@ pkgbase = zfs-dkms
pkgname = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
install = zfs.install
- depends = spl-dkms=0.6.4.2-1
- depends = zfs-utils=0.6.4.2-1
+ depends = spl-dkms=0.6.5.2-1
+ depends = zfs-utils=0.6.5.2-1
depends = dkms
provides = zfs
conflicts = zfs-git
@@ -28,7 +28,7 @@ pkgname = zfs-dkms
pkgname = zfs-utils
pkgdesc = Kernel module support files for the Zettabyte File System.
- depends = spl-dkms=0.6.4.2-1
+ depends = spl-dkms=0.6.5.2-1
conflicts = zfs-utils-git
conflicts = zfs-utils-lts
replaces = zfs-utils-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index ca72e8600db..82ce1380f47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase="zfs-dkms"
pkgname=("zfs-dkms" "zfs-utils")
-pkgver=0.6.4.2
+pkgver=0.6.5.2
pkgrel=1
license=('CDDL')
makedepends=("git")
@@ -36,6 +36,7 @@ build() {
./configure --prefix=/usr \
--sysconfdir=/etc \
+ --bindir=/usr/bin \
--sbindir=/usr/bin \
--libdir=/usr/lib \
--datadir=/usr/share \
@@ -76,7 +77,8 @@ package_zfs-utils() {
# move module tree /lib -> /usr/lib
cp -r "${pkgdir}"/{lib,usr}
rm -r "${pkgdir}"/lib
- # rm -r "${pkgdir}"/sbin
+ mv "${pkgdir}"/sbin/* "${pkgdir}"/usr/bin
+ rm -r "${pkgdir}"/sbin
install -D -m644 "${srcdir}"/zfs-utils.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs
install -D -m644 "${srcdir}"/zfs-utils.initcpio.install "${pkgdir}"/usr/lib/initcpio/install/zfs
diff --git a/zfs.install b/zfs.install
index 77a97982035..f406c472032 100644
--- a/zfs.install
+++ b/zfs.install
@@ -8,9 +8,9 @@ post_upgrade() {
check_initramfs() {
echo " >>> To build the module for the current kernel use this command:
- # dkms install zfs/0.6.4.2 -k _KERNEL_VERSION_HERE_
+ # dkms install zfs/0.6.5.2 -k _KERNEL_VERSION_HERE_
or just boot to kernel you want to build and do
- # dkms install zfs/0.6.4.2 -k \$(uname -r)
+ # dkms install zfs/0.6.5.2 -k \$(uname -r)
>>> Always remember to install kernel headers!
"