updates from upstream

spl: snapshot/debian/jessie/0.6.4-8-8ac6ff
zfs: snapshot/debian/jessie/0.6.4-24-6bec43

diff --git a/Makefile b/Makefile
index a38cff74e8060d96e2c72cf7f91b2d69d0b07ab9..db300bd5176cbd94599d5028f40852e14bdf0020 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ RELEASE=4.0
 # source form https://github.com/zfsonlinux/
 
 ZFSVER=0.6.4
-ZFSPKGREL=pve2~jessie
-SPLPKGREL=pve2~jessie
+ZFSPKGREL=pve3~jessie
+SPLPKGREL=pve3~jessie
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
@@ -64,8 +64,8 @@ download:
        git clone https://github.com/zfsonlinux/pkg-spl.git
        git clone https://github.com/zfsonlinux/pkg-zfs.git
        # list tags with:  git tag --list 'master/*'
-       cd pkg-spl; git checkout snapshot/debian/jessie/0.6.4-6-37d7cd
-       cd pkg-zfs; git checkout snapshot/debian/jessie/0.6.4-21-53b1d9
+       cd pkg-spl; git checkout snapshot/debian/jessie/0.6.4-8-8ac6ff
+       cd pkg-zfs; git checkout snapshot/debian/jessie/0.6.4-24-6bec43
        tar czf ${SPLSRC} pkg-spl
        tar czf ${ZFSSRC} pkg-zfs
 

diff --git a/pkg-spl.tar.gz b/pkg-spl.tar.gz
index 765c7bc2c451a65c560c23a259559d562711575b..a9f264db2ee343490eb84854c3b334febd10bfe0 100644 (file)
Binary files a/pkg-spl.tar.gz and b/pkg-spl.tar.gz differ

diff --git a/pkg-zfs.tar.gz b/pkg-zfs.tar.gz
index 68a1ce5d9dc95dc0fe670199591a75f0e9af57ba..ea4be846b6a6735e36f00840e3ea127e7ba1798c 100644 (file)
Binary files a/pkg-zfs.tar.gz and b/pkg-zfs.tar.gz differ

diff --git a/spl-changelog.Debian b/spl-changelog.Debian
index 70995ec4addcb6b13fa880a640a2e68461b16628..534d2de3fcbfd06a12da65b4111461ab8ac3c7ab 100644 (file)
--- a/spl-changelog.Debian
+++ b/spl-changelog.Debian
@@ -1,3 +1,9 @@
+spl-linux (0.6.4-pve3~jessie) unstable; urgency=medium
+
+  * update to snapshot/debian/jessie/0.6.4-8-8ac6ff
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:14:12 +0200
+
 spl-linux (0.6.4-pve2~jessie) unstable; urgency=medium
 
   * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)

diff --git a/spl-patches/fix-control.patch b/spl-patches/fix-control.patch
index 1cd300c98f72c135118b82d723329b5823e7fdef..5714f00e9687e6e453c9d0335a22e7689cd9d065 100644 (file)
--- a/spl-patches/fix-control.patch
+++ b/spl-patches/fix-control.patch
@@ -1,8 +1,8 @@
-Index: pkg-spl/debian/control.in
+Index: new/debian/control.in
 ===================================================================
---- pkg-spl.orig/debian/control.in
-+++ pkg-spl/debian/control.in
-@@ -33,32 +33,9 @@ Description: Native ZFS filesystem kerne
+--- new.orig/debian/control.in
++++ new/debian/control.in
+@@ -35,34 +35,9 @@ Description: Native ZFS filesystem kerne
   This package provides the source to the SPL kernel module in a form
   suitable for use by module-assistant or kernel-package.
  
@@ -11,6 +11,8 @@ Index: pkg-spl/debian/control.in
 -Depends: linux-headers-amd64, ${misc:Depends}, dkms (>> 2.1.1.2-5), lsb-release, file
 -Recommends: spl (>= ${source:Upstream-Version})
 -Provides: spl-modules
+-Conflicts: spl-modules-source
+-Replaces: spl-modules-source
 -Description: Solaris Porting Layer kernel modules for Linux
 - The Solaris Porting Layer (SPL) is a Linux kernel module which provides
 - many of the Solaris kernel APIs. This shim layer makes it possible to
@@ -35,10 +37,10 @@ Index: pkg-spl/debian/control.in
  Description: Solaris Porting Layer user-space utilities for Linux
   The Solaris Porting Layer (SPL) is a Linux kernel module which provides
   many of the Solaris kernel APIs. This shim layer makes it possible to
-Index: pkg-spl/debian/rules
+Index: new/debian/rules
 ===================================================================
---- pkg-spl.orig/debian/rules
-+++ pkg-spl/debian/rules
+--- new.orig/debian/rules
++++ new/debian/rules
 @@ -22,9 +22,7 @@ ifndef KVERS
  KVERS=$(shell uname -r | sed 's/-$(DEB_HOST_ARCH)//')
  endif

diff --git a/zfs-changelog.Debian b/zfs-changelog.Debian
index 47081d2faa78ac15106d63189345ed92a5a56aec..965849c456f3ca02212d6f45506317795a2ac2f0 100644 (file)
--- a/zfs-changelog.Debian
+++ b/zfs-changelog.Debian
@@ -1,3 +1,9 @@
+zfs-linux (0.6.4-pve3~jessie) unstable; urgency=medium
+
+  * update to snapshot/debian/jessie/0.6.4-24-6bec43
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:13:44 +0200
+
 zfs-linux (0.6.4-pve2~jessie) unstable; urgency=medium
 
   * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-21-53b1d9)

diff --git a/zfs-patches/fix-control.patch b/zfs-patches/fix-control.patch
index 2d60998a3e61e0c32284c49b3f8311b7fb95c65e..b7c36933a60193b9c033d6b29bd225ef25c288ce 100644 (file)
--- a/zfs-patches/fix-control.patch
+++ b/zfs-patches/fix-control.patch
@@ -1,8 +1,8 @@
-Index: pkg-zfs/debian/control.in
+Index: new/debian/control.in
 ===================================================================
---- pkg-zfs.orig/debian/control.in
-+++ pkg-zfs/debian/control.in
-@@ -102,39 +102,9 @@ Description: Native ZFS filesystem kerne
+--- new.orig/debian/control.in
++++ new/debian/control.in
+@@ -104,39 +104,9 @@ Description: Native ZFS filesystem kerne
   This package provides the source to the SPL kernel module in a form
   suitable for use by module-assistant or kernel-package.
  
@@ -11,9 +11,9 @@ Index: pkg-zfs/debian/control.in
 -Pre-Depends: spl-dkms
 -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}, file
 -Recommends: zfsutils
--Replaces: lzfs, lzfs-dkms
+-Replaces: lzfs, lzfs-dkms, zfs-modules-source
 -Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules, zfs-modules-source
--Conflicts: lzfs, lzfs-dkms
+-Conflicts: lzfs, lzfs-dkms, zfs-modules-source
 -Description: Native ZFS filesystem kernel modules for Linux
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
@@ -42,7 +42,7 @@ Index: pkg-zfs/debian/control.in
   zfsutils, ${misc:Depends}
  Description: Native ZFS root filesystem capabilities for Linux
   The Z file system is a pooled filesystem designed for maximum data
-@@ -148,7 +118,6 @@ Package: zfsutils
+@@ -150,7 +120,6 @@ Package: zfsutils
  Section: admin
  Architecture: linux-any
  Depends: initscripts, lsb-base, python, ${misc:Depends}, ${shlibs:Depends}
@@ -50,10 +50,10 @@ Index: pkg-zfs/debian/control.in
  Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
  Conflicts: zfs, zfs-fuse
  Replaces: zfs
-Index: pkg-zfs/debian/rules
+Index: new/debian/rules
 ===================================================================
---- pkg-zfs.orig/debian/rules
-+++ pkg-zfs/debian/rules
+--- new.orig/debian/rules
++++ new/debian/rules
 @@ -25,12 +25,10 @@ KARCH=$(shell uname -r | sed "s/.*-\([a-
  endif