use zfs/spl sources from our zfs userspace tool

to avoid version missmatch

diff --git a/Makefile b/Makefile
index 0b29c3ead526a7b9eafe639432425e186469ee7e..3fd09cfffdbdb9563cba31d7196fff17089c16eb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=4.0
 
 KERNEL_VER=4.1.3
-PKGREL=6
-# also include firmware of previous versrion into 
+PKGREL=7
+# also i7clude firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
 
@@ -65,11 +65,10 @@ HPSASRC=${HPSADIR}-140.tar.bz2
 #RR272XSRC=RR272x_1x-Linux-Src-v1.5-130325-0732.tar.gz
 #RR272XDIR=rr272x_1x-linux-src-v1.5
 
-ZFSVER=0.6.4.2
-SPLDIR=spl-${ZFSVER}
-SPLSRC=spl-${ZFSVER}.tar.gz
-ZFSDIR=zfs-${ZFSVER}
-ZFSSRC=zfs-${ZFSVER}.tar.gz
+SPLDIR=pkg-spl
+SPLSRC=pkg-spl.tar.gz
+ZFSDIR=pkg-zfs
+ZFSSRC=pkg-zfs.tar.gz
 ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
 SPL_MODULES=spl.ko splat.ko
 

diff --git a/changelog.Debian b/changelog.Debian
index aa5f6a0300bc96d3d22dbf68ac7860efc3f25daf..dd662b2f10f92a4edc9c4f4093fc830a4436f355 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,10 @@
+pve-kernel-4.1.3 (4.1.3-7) unstable; urgency=medium
+
+  * use zfs/spl sources from our zfs userspace tool (to
+  avoid version missmatch)
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Jul 2015 18:39:00 +0200
+
 pve-kernel-4.1.3 (4.1.3-6) unstable; urgency=medium
 
   * update to 4.1.3 (ubuntgu wily)

diff --git a/pkg-spl.tar.gz b/pkg-spl.tar.gz
new file mode 100644 (file)
index 0000000..765c7bc
Binary files /dev/null and b/pkg-spl.tar.gz differ

diff --git a/pkg-zfs.tar.gz b/pkg-zfs.tar.gz
new file mode 100644 (file)
index 0000000..68a1ce5
Binary files /dev/null and b/pkg-zfs.tar.gz differ

diff --git a/spl-0.6.4.2.tar.gz b/spl-0.6.4.2.tar.gz
deleted file mode 100644 (file)
index 9225145..0000000
Binary files a/spl-0.6.4.2.tar.gz and /dev/null differ

diff --git a/zfs-0.6.4.2.tar.gz b/zfs-0.6.4.2.tar.gz
deleted file mode 100644 (file)
index 964549b..0000000
Binary files a/zfs-0.6.4.2.tar.gz and /dev/null differ