bump version, update changelog

fix make upload target
add make deb target
2016-06-28 15:41:47 +02:00 · 2016-06-28 15:27:06 +02:00 · 2016-06-28 14:35:56 +02:00 · 2016-06-28 14:35:35 +02:00 · 2016-06-28 14:35:23 +02:00 · 2016-06-28 14:35:12 +02:00
19 changed files with 396 additions and 966 deletions
@@ -1,6 +0,0 @@
 [submodule "zfs-debian"]
 	path = zfs-debian
 	url = ../mirror_zfs-debian
 [submodule "spl-debian"]
 	path = spl-debian
 	url = ../mirror_spl-debian
@@ -1,78 +1,79 @@
-RELEASE=5.1
+RELEASE=3.4
 # source form https://github.com/zfsonlinux/
-ZFSVER=0.7.9
+# also update version in 
-ZFSPKGREL=pve1~bpo9
+# zfs-changelog.Debian and spl-changelog.Debian
-SPLPKGREL=pve1~bpo9
+ZFSVER=0.6.5.7
 ZFSPKGREL=5~bpo70
 SPLPKGREL=5~bpo70
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
-SPLDIR=spl-build
+SPLDIR=pkg-spl
-SPLSRC=spl-debian
+SPLSRC=pkg-spl.tar.gz
-ZFSDIR=zfs-build
+ZFSDIR=pkg-zfs
-ZFSSRC=zfs-debian
+ZFSSRC=pkg-zfs.tar.gz
-SPL_DEB = 					\
+SPL_DEBS= 					\
 spl_${SPLPKGVER}_amd64.deb
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEBS= 					\
-ZFS_DEB2= 					\
+libnvpair1_${ZFSPKGVER}_amd64.deb 		\
-libuutil1linux_${ZFSPKGVER}_amd64.deb		\
+libuutil1_${ZFSPKGVER}_amd64.deb		\
-libzfs2linux_${ZFSPKGVER}_amd64.deb		\
+libzfs2_${ZFSPKGVER}_amd64.deb			\
-libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
+libzfs-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool2linux_${ZFSPKGVER}_amd64.deb		\
+libzpool2_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
-zfs-zed_${ZFSPKGVER}_amd64.deb			\
+zfs-initramfs_${ZFSPKGVER}_amd64.deb		\
-zfs-initramfs_${ZFSPKGVER}_all.deb		\
+zfsutils_${ZFSPKGVER}_amd64.deb
 zfs-test_${ZFSPKGVER}_amd64.deb		\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb
 ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
-DEBS=${SPL_DEB} ${ZFS_DEBS}
+DEBS=${SPL_DEBS} ${ZFS_DEBS} 
-all: deb
+all: ${DEBS}
 .PHONY: deb
 deb: ${DEBS}
 .PHONY: dinstall
 dinstall: ${DEBS}
 	dpkg -i ${DEBS}
 .PHONY: submodule
 submodule:
 	test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
 	test -f "${SPLSRC}/debian/changelog" || git submodule update --init
 .PHONY: spl
-spl: ${SPL_DEB}
+spl ${SPL_DEBS}: ${SPLSRC}
 ${SPL_DEB}: ${SPLSRC}
 	rm -rf ${SPLDIR}
-	mkdir ${SPLDIR}
+	tar xf ${SPLSRC}
 	cp -a ${SPLSRC}/* ${SPLDIR}/
 	mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org
 	cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog
 	cd ${SPLDIR}; ln -s ../spl-patches patches
 	cd ${SPLDIR}; quilt push -a
 	cd ${SPLDIR}; rm -rf .pc ./patches
 	cd ${SPLDIR}; ./debian/rules override_dh_prep-base-deb-files
 	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
 .PHONY: zfs
-zfs: $(ZFS_DEBS)
+zfs ${ZFS_DEBS}: ${ZFSSRC}
 $(ZFS_DEB2): $(ZFS_DEB1)
 $(ZFS_DEB1): $(ZFSSRC)
 	rm -rf ${ZFSDIR}
-	mkdir ${ZFSDIR}
+	tar xf ${ZFSSRC}
 	cp -a ${ZFSSRC}/* ${ZFSDIR}/
 	mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org
 	cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
 	cd ${ZFSDIR}; ln -s ../zfs-patches patches
 	cd ${ZFSDIR}; quilt push -a
 	cd ${ZFSDIR}; rm -rf .pc ./patches
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
+	cd ${ZFSDIR}; ./debian/rules override_dh_prep-base-deb-files
 	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
 .PHONY: download
 download:
 	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
 	git clone -b master/debian/wheezy/0.6.5.7-3-wheezy https://github.com/zfsonlinux/pkg-spl.git
 	git clone -b master/debian/wheezy/0.6.5.7-8-wheezy https://github.com/zfsonlinux/pkg-zfs.git
 	tar czf ${SPLSRC} pkg-spl
 	tar czf ${ZFSSRC} pkg-zfs
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes *.buildinfo ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
 .PHONY: distclean
 distclean: clean
@@ -80,4 +81,4 @@ distclean: clean
 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --dist wheezy
@@ -10,4 +10,4 @@ modules with the kernel.
 For licensing questions, see:
-http://open-zfs.org/wiki/Talk:FAQ
+http://open-zfs.org/wiki/Talk:FAQ
@@ -1,138 +1,61 @@
-spl-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
+spl-linux (0.6.5.7-5~bpo70) unstable; urgency=low
-  * update SPL to 0.7.9
+  * rebuild using wheezy
- -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 15:41:00 +0200
-spl-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
+spl-linux (0.6.5.7-4~bpo70) unstable; urgency=low
-  * update SPL to 0.7.8 (no changes)
+  * update pkg-spl to spl-0.6.5.7-3-wheezy
- -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
+  * change versioning scheme to allow upgrades from PVE 3.4 to PVE 4.2
-spl-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 13:45:00 +0200
-  * update SPL to 0.7.7
+spl-linux (0.6.5-3~wheezy) unstable; urgency=low
 -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
 spl-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:47:54 +0100
 spl-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.4
 -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
 spl-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
  * update spl to 0.7.3
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 spl-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
  * update spl to 0.7.2
  * clean up man pages
 -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:33:04 +0200
 spl-linux (0.6.5.11-pve10~bpo90) unstable; urgency=medium
  * update spl to debian/0.6.5.11-1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 spl-linux (0.6.5.9-pve9~bpo90) unstable; urgency=medium
  * rebuild for PVE 5.0 / Debian Stretch
 -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 spl-linux (0.6.5.9-pve8~bpo80) unstable; urgency=medium
  * update spl to debian/0.6.5.9-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:35 +0100
 spl-linux (0.6.5.8-pve7~bpo80) unstable; urgency=medium
  * update spl to debian/0.6.5.8-2
  * switch package upstream sources to Debian (Jessie)
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
 spl-linux (0.6.5.7-pve6~bpo80) unstable; urgency=medium
  * update pkg-spl to jessie/0.6.5.7-5
  * change package versioning to allow upgrades from PVE3/wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
 spl-linux (0.6.5-pve5~jessie) unstable; urgency=medium
  * Update pkg-spl to jessie/0.6.5.6-3
 -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Apr 2016 11:11:59 +0200
 spl-linux (0.6.5-pve4~jessie) unstable; urgency=medium
  * update to 0.6.5.6
- -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:49:49 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:38 +0200
-spl-linux (0.6.5-pve3~jessie) unstable; urgency=medium
+spl-linux (0.6.5-2~wheezy) unstable; urgency=low
  * update to 0.6.5.4
- -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 11:00:40 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 17 Jan 2016 14:44:31 +0100
-spl-linux (0.6.5-pve2~jessie) unstable; urgency=medium
+spl-linux (0.6.5-1~wheezy) unstable; urgency=low
-  * update to 0.6.5.3
+  * update to master/debian/wheezy/0.6.5-1-wheezy
- -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:40:58 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:03:25 +0200
-spl-linux (0.6.5-pve1~jessie) unstable; urgency=medium
+spl-linux (0.6.4-4~wheezy) unstable; urgency=low
-  * update to master/debian/jessie/0.6.5-1
+  * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy)
- -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:04:23 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 07:16:12 +0200
-spl-linux (0.6.4-pve3~jessie) unstable; urgency=medium
+spl-linux (0.6.4-3~wheezy) unstable; urgency=low
-  * update to snapshot/debian/jessie/0.6.4-8-8ac6ff
+  * update to 0.6.4.1
- -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:14:12 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:14 +0200
-spl-linux (0.6.4-pve2~jessie) unstable; urgency=medium
+spl-linux (0.6.4-2~wheezy) unstable; urgency=low
-  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)
+  * include original zol changelog files
- -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:02:31 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 07:38:02 +0200
-spl-linux (0.6.4-pve1~jessie) unstable; urgency=medium
+spl-linux (0.6.4-1~wheezy) unstable; urgency=low
-  * update to 0.6.4 (use upstream zol package definitions)
+  * update to 0.6.4 (keep Proxmox VE versioning schema)
- -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:17:26 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Apr 2015 09:32:24 +0200
-spl-linux (0.6.3-pve1~jessie) unstable; urgency=medium
+spl-linux (0.6.3-1~wheezy) unstable; urgency=low
  * recompile for jessie
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:03:01 +0100
 spl-linux (0.6.3-pve1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -1,170 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 12 Oct 2016 10:57:39 +0200
 Subject: [PATCH] remove DKMS and module build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 debian/control    |  1 -
 debian/control.in | 31 -------------------------
 debian/rules      | 68 +------------------------------------------------------
 3 files changed, 1 insertion(+), 99 deletions(-)
 diff --git a/debian/control b/debian/control
 index 07db14a..01387e5 100644
 --- a/debian/control
 +++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: autogen,
                autotools-dev,
                debhelper (>= 9),
                dh-autoreconf,
 -               dkms (>> 2.2.0.2-1~),
                libtool
 Standards-Version: 4.1.2
 Homepage: http://www.zfsonlinux.org/
 diff --git a/debian/control.in b/debian/control.in
 index 91242a1..5fd81aa 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -8,47 +8,16 @@ Build-Depends: autogen,
                autotools-dev,
                debhelper (>= 9),
                dh-autoreconf,
 -               dkms (>> 2.2.0.2-1~),
                libtool
 Standards-Version: 4.1.2
 Homepage: http://www.zfsonlinux.org/
 Vcs-Git: git@salsa.debian.org:zfsonlinux-team/spl.git
 Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl
 -Package: spl-dkms
 -Architecture: all
 -Depends: dkms (>> 2.2.1.0),
 -         file,
 -         libc-dev,
 -         libelf-dev,
 -         lsb-release,
 -         ${misc:Depends}
 -Suggests: spl (>= ${source:Upstream-Version}),
 -         @LINUX_COMPAT@
 -Conflicts: spl (<< 0.7.9~)
 -Provides: spl-modules
 -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
 - run Solaris kernel code in the Linux kernel with relatively minimal
 - modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
 - module which provides a testing harness for the SPL module.
 - .
 - SPL can be particularly useful when you want to track upstream Illumos
 - (or any other OpenSolaris fork) development closely and don't want the
 - overhead of maintaining a large patch which converts Solaris primitives
 - to Linux primitives.
 - .
 - This package contains the source code for the SPL and SPLAT Linux kernel
 - modules, which can be used with DKMS, so that local kernel modules are
 - automatically built and installed every time the kernel packages are
 - upgraded.
 -
 Package: spl
 Architecture: linux-any
 Conflicts: spl-dev, splat
 Depends: ${misc:Depends}, ${shlibs:Depends}
 -Recommends: spl-modules | spl-dkms
 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
 diff --git a/debian/rules b/debian/rules
 index 3a12abc..8dca8fd 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -14,12 +14,8 @@ ifndef KVERS
 KVERS=$(shell uname -r)
 endif
 -non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 -PACKAGE=spl
 -pmodules = $(PACKAGE)-modules-$(non_epoch_version)
 -
 %:
 -	dh $@ --with dkms,autoreconf --parallel
 +	dh $@ --with autoreconf --parallel
 override_dh_auto_configure:
 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
@@ -45,69 +41,7 @@ override_dh_auto_install:
 	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
 	$(MAKE) distdir
 -	@# This shunt allows DKMS to install the Module.symvers and spl_config.h
 -	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 -	echo '#!/bin/sh'  >'$(CURDIR)/$(NAME)-$(VERSION)/cp'
 -	echo 'cp "$$@"'  >>'$(CURDIR)/$(NAME)-$(VERSION)/cp'
 -	chmod 755 '$(CURDIR)/$(NAME)-$(VERSION)/cp'
 -
 -	# Install the DKMS source.
 -	mkdir -p '$(CURDIR)/debian/tmp/usr/src/'
 -	mv '$(CURDIR)/$(NAME)-$(VERSION)' '$(CURDIR)/debian/tmp/usr/src/'
 -
 -override_dh_dkms:
 -	dh_dkms -V $(VERSION)
 -
 override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
 -
 -# ------------
 -
 -override_dh_prep-deb-files:
 -	for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
 -		sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ;  s/_ARCH_/$(DEB_HOST_ARCH)/g' \
 -		< $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
 -	done
 -	sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
 -	< debian/control.modules.in > debian/control
 -
 -override_dh_configure_modules: override_dh_configure_modules_stamp
 -override_dh_configure_modules_stamp:
 -	./configure --with-config=kernel --with-linux=$(KSRC) \
 -		--with-linux-obj=$(KOBJ) \
 -		--disable-debug-kmem
 -	touch override_dh_configure_modules_stamp
 -
 -override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_installdirs -p${pmodules}-di
 -	dh_install -p${pmodules}-di
 -	dh_gencontrol -p${pmodules}-di
 -
 -	dh_builddeb -p${pmodules}-di
 -
 -override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_installdocs -p${pmodules}
 -	dh_install -p${pmodules}
 -	dh_installchangelogs -p${pmodules}
 -	dh_compress -p${pmodules}
 -	dh_strip -p${pmodules}
 -	dh_fixperms -p${pmodules}
 -	dh_installdeb -p${pmodules}
 -	dh_gencontrol -p${pmodules}
 -	dh_md5sums -p${pmodules}
 -
 -	dh_builddeb -p${pmodules}
 -- 
 2.11.0
@@ -0,0 +1,119 @@
 Index: new/debian/rules
 ===================================================================
 --- new.orig/debian/rules	2015-10-09 10:02:21.000000000 +0200
 +++ new/debian/rules	2015-10-09 10:12:04.000000000 +0200
@@ -22,9 +22,7 @@
 KVERS=$(shell uname -r | sed 's/-$(DEB_HOST_ARCH)//')
 endif
 -CFG_OPTS=--without-selinux \
 -	--with-linux=$(KSRC) \
 -	--with-linux-obj=$(KOBJ)
 +CFG_OPTS=--without-selinux
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 PACKAGE=spl
@@ -33,7 +31,7 @@
 KIMGVER=$(shell dpkg -s linux-image-$(KVERS)-$(DEB_HOST_ARCH) | grep ^Version | sed 's/.*: //')
 %:
 -	dh $@ --with dkms --parallel
 +	dh $@ --parallel
 override_dh_prep-base-deb-files:
 	sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g' < debian/control.in > debian/control
@@ -75,59 +73,6 @@
 	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
 	$(MAKE) distdir
 -	@# Install the DKMS source.
 -	@# We only want the files needed to build the modules
 -	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
 -	touch '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/.nogitrelease'
 -	cp '$(CURDIR)/autogen.sh' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/'
 -	( for d in include module config; do \
 -	     rm -Rf $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/$$d; \
 -	done)
 -	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
 -	@# Hellish awk line:
 -	@#  * Deletes from configure.ac the parts not needed for building the kernel module
 -	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
 -	@#        (Makefile$|include/|module/|*.release$)
 -	@#  * Takes care of spaces and tabs
 -	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|spl\.release([ \t]+)?$$))/){next} } {print}' \
 -		'$(CURDIR)/$(NAME)-$(VERSION)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/configure.ac'
 -	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
 -	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
 -		'$(CURDIR)/$(NAME)-$(VERSION)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Sanity test
 -	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Run autogen on the stripped source tree
 -	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
 -	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache'
 -
 -	@# This shunt allows DKMS to install the Module.symvers and spl_config.h
 -	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 -	echo '#!/bin/sh'  >'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -	echo 'cp "$$@"'  >>'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -
 -	@# Duplicate the dkms directory for module-assistant source package
 -	install -d $(CURDIR)/debian/tmp/usr/src/modules
 -	cp -r $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION) $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)
 -	mkdir -p $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian
 -	cp debian/copyright debian/module/* \
 -	    $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/
 -	sed 's/^spl-linux /spl-modules /' debian/changelog \
 -	    > $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/changelog
 -	chmod 755 $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/rules
 -	chown -R root.src $(CURDIR)/debian/tmp
 -	find $(CURDIR)/debian/tmp/usr/src -type d | xargs chmod 755
 -	find $(CURDIR)/debian/tmp/usr/src -type f -perm -100 | xargs chmod 755
 -	find $(CURDIR)/debian/tmp/usr/src -type f -not -perm -100 | xargs chmod 644
 -	chmod 775 $(CURDIR)/debian/tmp/usr/src/modules
 -	cd $(CURDIR)/debian/tmp/usr/src && tar cf $(PACKAGE).tar modules
 -	rm -Rf $(CURDIR)/debian/tmp/usr/src/modules
 -	bzip2 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar
 -	chmod 644 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2
 -	install -d $(CURDIR)/debian/spl-modules-source/usr/src
 -	mv $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2 $(CURDIR)/debian/spl-modules-source/usr/src/
 -	rm -Rf $(CURDIR)/debian/spl-modules-source/usr/src/$(NAME)-$(VERSION)
 -
 override_dh_dkms:
 	dh_dkms -V $(VERSION)
 Index: new/debian/control.in
 ===================================================================
 --- new.orig/debian/control.in	2015-10-09 10:02:21.000000000 +0200
 +++ new/debian/control.in	2015-10-09 10:12:44.000000000 +0200
@@ -35,30 +35,6 @@
  This package provides the source to the SPL kernel module in a form
  suitable for use by module-assistant or kernel-package.
 -Package: spl-dkms
 -Architecture: all
 -Depends: linux-headers-amd64, libc6-dev, ${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
 - run Solaris kernel code in the Linux kernel with relatively minimal
 - modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
 - module which provides a testing harness for the SPL module.
 - .
 - SPL can be particularly useful when you want to track upstream Illumos
 - (or any other OpenSolaris fork) development closely and don't want the
 - overhead of maintaining a large patch which converts Solaris primitives
 - to Linux primitives.
 - .
 - This package contains the source code for the SPL and SPLAT Linux kernel
 - modules, which can be used with DKMS, so that local kernel modules are
 - automatically built and installed every time the kernel packages are
 - upgraded.
 -
 Package: spl
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -1 +1 @@
-0001-remove-DKMS-and-module-build.patch
+fix-control
@@ -1,227 +1,74 @@
-zfs-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
+zfs-linux (0.6.5.7-5~bpo70) unstable; urgency=low
-  * update ZFS to 0.7.9
+  * rebuild using wheezy
- -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 15:41:00 +0200
-zfs-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
+zfs-linux (0.6.5.7-4~bpo70) unstable; urgency=low
-  * update ZFS to 0.7.8 (no changes)
+  * update pkg-zfs to 0.6.5.7-8-wheezy
- -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
+  * drop unneeded/non-upstream pull requests:
    - #1099: iSCSI support for ZoL
    - #1476: Change sharesmb to use REGISTRY shares for better control by user/admin
    - #2790: Rewrite of nfs.c to keep options per host separated.
    - #3238: Allow "zfs unshare <proto> -a" much like "zfs share <proto> -a" (WIP)
-zfs-linux (0.7.7-pve2~bpo9) unstable; urgency=medium
+  * change versioning scheme to allow upgrades from PVE 3.4 to PVE 4.2
-  * (temporarily) revert likely cause of #7401
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 13:45:00 +0200
- -- Proxmox Support Team <support@proxmox.com>  Mon, 9 Apr 2018 09:49:27 +0200
+zfs-linux (0.6.5-3~wheezy) unstable; urgency=low
-zfs-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
+  * update to 0.6.5.6
-  * update ZFS to 0.7.7
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:59 +0200
- -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
+zfs-linux (0.6.5-2~wheezy) unstable; urgency=low
-zfs-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
+  * update to 0.6.5.4
-  * update ZFS to 0.7.6
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 17 Jan 2016 14:44:55 +0100
- -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:48:29 +0100
+zfs-linux (0.6.5-1~wheezy) unstable; urgency=low
-zfs-linux (0.7.4-pve2~bpo9) unstable; urgency=medium
+  * update to master/debian/wheezy/0.6.5.2-2-wheezy 
-  * cherry-pick ARC hit rate fix from 0.7.6
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:04:04 +0200
-  * always load ZFS modules on boot
+zfs-linux (0.6.4-4~wheezy) unstable; urgency=low
- -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Jan 2018 11:31:14 +0100
+  * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy)
  * use upstream version of /etc/default/zfs
-zfs-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 07:17:40 +0200
-  * update ZFS to 0.7.4
+zfs-linux (0.6.4-3~wheezy) unstable; urgency=low
- -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
+  * update to 0.6.4.1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:44 +0200
-zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
+zfs-linux (0.6.4-2~wheezy) unstable; urgency=low
-  * update ZFS to 0.7.3
+  * cleanup /etc/default/zfs
  * include orignial zol changelog files
-  * include fix for user namespace setgid issue (#6800 upstream)
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 07:30:59 +0200
 zfs-linux (0.6.4-1~wheezy) unstable; urgency=low
- -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
+  * update to 0.6.4
-zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Apr 2015 09:33:13 +0200
-  * update zfs to 0.7.2
+zfs-linux (0.6.3-3~wheezy) unstable; urgency=low
-  * add PR 6616 - zfs send/recv compatibility with 0.6.5
+  * install init.d file for zed daemon
-  * add PR 6695 - zfs recv: don't skip over objects which should be freed
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 14:57:30 +0100
  * various small fixes
  * split test suite into zfs-test package
 -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:34:05 +0200
 zfs-linux (0.6.5.11-pve18~bpo90) unstable; urgency=medium
  * fix #1509: arc_summary error with L2ARC
 -- Proxmox Support Team <support@proxmox.com>  Mon, 2 Oct 2017 09:30:41 +0200
 zfs-linux (0.6.5.11-pve17~bpo90) unstable; urgency=medium
  * update zfs to debian/0.6.5.11-1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 zfs-linux (0.6.5.9-pve16~bpo90) unstable; urgency=medium
  * drop transitional packages
  * convert python scripts to python 3, drop .py suffix
  * rebuild for PVE 5.0 / Debian Stretch
 -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 zfs-linux (0.6.5.9-pve15~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.9-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:10 +0100
 zfs-linux (0.6.5.8-pve14~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-3
 -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Jan 2017 09:34:58 +0100
 zfs-linux (0.6.5.8-pve13~bpo80) unstable; urgency=medium
  * fix #1184: zfs-share.service has wrong path to 'rm' command
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Oct 2016 11:25:47 +0200
 zfs-linux (0.6.5.8-pve12~bpo80) unstable; urgency=medium
  * import with "-d /dev/disk/by-id" in systemd service
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Oct 2016 13:48:08 +0200
 zfs-linux (0.6.5.8-pve11~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-1
  * switch package upstream sources to Debian (Jessie)
  * add transitional packages for upgrades
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
 zfs-linux (0.6.5.7-pve10~bpo80) unstable; urgency=medium
  * update to pkg-zfs jessie/0.6.5.7-8
  * change package versioning to allow upgrades from PVE3/wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
 zfs-linux (0.6.5-pve9~jessie) unstable; urgency=medium
  * Update to pkg-zfs jessie/0.6.5.6-3
 -- Proxmox Support Team <support@proxmox.com>  Tue, 12 Apr 2016 09:51:35 +0200
 zfs-linux (0.6.5-pve8~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:50:22 +0200
 zfs-linux (0.6.5-pve7~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 10:51:17 +0100
 zfs-linux (0.6.5-pve6~jessie) unstable; urgency=medium
  * Prepare to tag zfs-0.6.5.3
 -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Nov 2015 07:21:44 +0100
 zfs-linux (0.6.5-pve5~jessie) unstable; urgency=medium
  * Illumos 6267 - dn_bonus evicted too early
  * Fix use-after-free in vdev_disk_physio_completion
 -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:42:42 +0100
 zfs-linux (0.6.5-pve4~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.2-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 05 Oct 2015 17:56:45 +0200
 zfs-linux (0.6.5-pve3~jessie) unstable; urgency=medium
  * do not install /etc/init.d/zfs-zed script to avoid double startup
    with systemd
 -- Proxmox Support Team <support@proxmox.com>  Mon, 28 Sep 2015 10:14:40 +0200
 zfs-linux (0.6.5-pve2~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Sep 2015 12:45:33 +0200
 zfs-linux (0.6.5-pve1~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:02:41 +0200
 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)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:03:21 +0200
 zfs-linux (0.6.4-pve1~jessie) unstable; urgency=medium
  * update to 0.6.4 (use upstream zol package definitions)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:19:22 +0200
 zfs-linux (0.6.3-pve3~jessie) unstable; urgency=medium
  * ignore zfs-import-scan errors
 -- Proxmox Support Team <support@proxmox.com>  Tue, 31 Mar 2015 17:52:40 +0200
 zfs-linux (0.6.3-pve2~jessie) unstable; urgency=medium
  * use systemd for service startup
  * install zed configuration file /etc/zfs/zed.d/zed.rc
 -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 15:52:54 +0100
 zfs-linux (0.6.3-pve1~jessie) unstable; urgency=medium
  * recompile on jessie
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:02:08 +0100
 zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
@@ -236,4 +83,3 @@ zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -1,282 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 6 Feb 2017 11:03:10 +0100
 Subject: [PATCH] remove DKMS, modules and dracut build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 debian/control       |   1 -
 debian/control.in    |  40 ++-----------------
 debian/not-installed |   2 +
 debian/rules         | 106 +--------------------------------------------------
 4 files changed, 7 insertions(+), 142 deletions(-)
 diff --git a/debian/control b/debian/control
 index 9e4f8fa7..42fbec35 100644
 --- a/debian/control
 +++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: autotools-dev,
                debhelper (>= 10.2),
                dh-autoreconf,
                dh-python,
 -               dkms (>> 2.1.1.2-5),
                libattr1-dev,
                libblkid-dev,
                libselinux1-dev,
 diff --git a/debian/control.in b/debian/control.in
 index e193f017..2cb2f614 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -9,7 +9,6 @@ Build-Depends: autotools-dev,
                debhelper (>= 10.2),
                dh-autoreconf,
                dh-python,
 -               dkms (>> 2.1.1.2-5),
                libattr1-dev,
                libblkid-dev,
                libselinux1-dev,
@@ -86,26 +85,10 @@ Description: OpenZFS pool library for Linux
  .
  This zpool library provides support for managing zpools.
 -Package: zfs-dkms
 -Architecture: all
 -Pre-Depends: spl-dkms (<<${source:Upstream-Version}.),
 -             spl-dkms (>= ${source:Upstream-Version})
 -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
 -Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}), @LINUX_COMPAT@
 -Provides: zfs-modules
 -Description: OpenZFS 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
 - checksums.
 - .
 - This DKMS package includes the SPA, DMU, ZVOL, and ZPL components of
 - OpenZFS.
 -
 Package: zfs-initramfs
 Architecture: all
 Depends: busybox-initramfs | busybox-static | busybox,
          initramfs-tools,
 -         zfs-modules | zfs-dkms,
          zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends}
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
@@ -116,29 +99,14 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
  This package adds OpenZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 -Package: zfs-dracut
 -Architecture: all
 -Depends: dracut,
 -         zfs-modules | zfs-dkms,
 -         zfsutils-linux (>= ${binary:Version}),
 -         ${misc:Depends}
 -Description: OpenZFS root filesystem capabilities for Linux - dracut
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
 - checksums.
 - .
 - This package adds OpenZFS to the system initramfs with a hook
 - for the dracut infrastructure.
 -
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
 Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
 -Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
 -Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
 +Recommends: lsb-base, zfs-zed
 Suggests: nfs-kernel-server,
           samba-common-bin (>= 3.0.23),
 -          zfs-initramfs | zfs-dracut
 +          zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
@@ -152,8 +120,7 @@ Description: command-line tools to manage OpenZFS filesystems
 Package: zfs-zed
 Section: contrib/admin
 Architecture: linux-any
 -Depends: zfs-modules | zfs-dkms,
 -         zfsutils-linux (>= ${binary:Version}),
 +Depends: zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: OpenZFS Event Daemon
@@ -176,7 +143,6 @@ Depends: acl,
          python,
          sudo,
          sysstat,
 -         zfs-modules | zfs-dkms,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 diff --git a/debian/not-installed b/debian/not-installed
 index a008985c..c60b0016 100644
 --- a/debian/not-installed
 +++ b/debian/not-installed
@@ -6,3 +6,5 @@ etc/zfs/vdev_id.conf.alias.example
 etc/zfs/vdev_id.conf.multipath.example
 etc/zfs/vdev_id.conf.sas_direct.example
 etc/zfs/vdev_id.conf.sas_switch.example
 +usr/lib/dracut
 +usr/share/zfs/enum-extract.pl
 diff --git a/debian/rules b/debian/rules
 index e2c5a25f..86b5994d 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -5,9 +5,6 @@ include /usr/share/dpkg/default.mk
 LSB_DISTRIBUTOR := $(shell lsb_release -is)
 NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
 -DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
 -		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
 -
 ifndef BUILD_UDEB
 BUILD_UDEB=false
 endif
@@ -17,21 +14,16 @@ KVERS=$(shell uname -r)
 endif
 ifndef SPL
 -SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
 -endif
 -
 -ifndef SPLOBJ
 -SPLOBJ=/var/lib/dkms/spl/$(DEB_VERSION_UPSTREAM)/$(KVERS)/$(DEB_TARGET_GNU_CPU)
 +SPL=../spl-build
 endif
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 PACKAGE=zfs
 -pmodules = $(PACKAGE)-modules-$(non_epoch_version)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 -	dh $@ --with autoreconf,dkms,python3,systemd --parallel
 +	dh $@ --with autoreconf,python3,systemd --parallel
 override_dh_auto_configure:
 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
@@ -74,37 +66,6 @@ override_dh_auto_install:
 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 -	@# Get a bare copy of the source code for DKMS.
 -	@# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
 -	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
 -	$(MAKE) distdir
 -
 -	@# Install the DKMS source.
 -	@# We only want the files needed to build the modules
 -	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts'
 -	cp '$(CURDIR)/scripts/enum-extract.pl' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts'
 -	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)' || exit 1;)
 -	@# Hellish awk line:
 -	@#  * Deletes from configure.ac the parts not needed for building the kernel module
 -	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
 -	@#        (Makefile$|include/|module/|*.release$)
 -	@#  * Takes care of spaces and tabs
 -	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
 -		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac'
 -	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
 -	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
 -		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Sanity test
 -	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Run autogen on the stripped source tree
 -	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'; ./autogen.sh
 -	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/autom4te.cache'
 -
 -	@# This shunt allows DKMS to install the Module.symvers and zfs_config.h
 -	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 -	printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'
 -	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'
 -
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
 	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
 		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
@@ -114,9 +75,6 @@ override_dh_auto_install:
 	chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
 	chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
 -override_dh_dkms:
 -	dh_dkms -V $(DEB_VERSION_UPSTREAM)
 -
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V
 ifeq ($(BUILD_UDEB), true)
@@ -154,65 +112,5 @@ override_dh_install:
 # ------------
 -override_dh_prep-deb-files:
 -	for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
 -		sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/' \
 -		< $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
 -	done
 -	sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
 -	< debian/control.modules.in > debian/control
 -
 -override_dh_configure_modules_udeb: override_dh_configure_modules_udeb_stamp
 -override_dh_configure_modules_udeb_stamp:
 -	./configure \
 -		--without-selinux \
 -		--with-config=kernel \
 -		--with-linux=$(KSRC) \
 -		--with-linux-obj=$(KOBJ) \
 -		--with-spl=$(SPL) \
 -		--with-spl-obj=$(SPLOBJ)
 -	touch override_dh_configure_modules_udeb_stamp
 -
 -override_dh_configure_modules: override_dh_configure_modules_stamp
 -override_dh_configure_modules_stamp:
 -	./configure \
 -		--with-config=kernel \
 -		--with-linux=$(KSRC) \
 -		--with-linux-obj=$(KOBJ) \
 -		--with-spl=$(SPL) \
 -		--with-spl-obj=$(SPLOBJ)
 -	touch override_dh_configure_modules_stamp
 -
 -override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules_udeb
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_installdirs -p${pmodules}-di
 -	dh_install -p${pmodules}-di
 -	dh_gencontrol -p${pmodules}-di
 -
 -	dh_builddeb -p${pmodules}-di
 -
 -override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_install -p${pmodules}
 -	dh_installdocs -p${pmodules}
 -	dh_installchangelogs -p${pmodules}
 -	dh_compress -p${pmodules}
 -	dh_strip -p${pmodules}
 -	dh_fixperms -p${pmodules}
 -	dh_installdeb -p${pmodules}
 -	dh_gencontrol -p${pmodules}
 -	dh_md5sums -p${pmodules}
 -	dh_builddeb -p${pmodules}
 -
 debian-copyright:
 	cme update dpkg-copyright -file debian/copyright.cme
 -- 
 2.11.0
@@ -1,29 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 24 Oct 2016 13:47:06 +0200
 Subject: [PATCH] import with -d /dev/disk/by-id in scan service
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 etc/systemd/system/zfs-import-scan.service.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
 index abc8e8e6..8fe2c107 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
 Type=oneshot
 RemainAfterExit=yes
 ExecStartPre=-/sbin/modprobe zfs
 -ExecStart=@sbindir@/zpool import -aN -o cachefile=none
 +ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
 [Install]
 WantedBy=zfs-import.target
 -- 
 2.11.0
@@ -1,30 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Fri, 19 Jan 2018 12:13:46 +0100
 Subject: [PATCH] always load ZFS module on boot
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 since zfs-import-scan.service is disabled by default, and
 zfs-import-cache.service only gets started if a cache file exists, this
 is needed for zfs-mount, zfs-share and zfs-zed services in case ZFS is
 not actually used.
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 etc/modules-load.d/zfs.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in
 index 8b41baa3..59b058c9 100644
 --- a/etc/modules-load.d/zfs.conf.in
 +++ b/etc/modules-load.d/zfs.conf.in
@@ -1,3 +1,3 @@
 # Always load kernel modules at boot.  The default behavior is to load the
 # kernel modules in the zfs-import-*.service or when blkid(8) detects a pool.
 -#zfs
 +zfs
 -- 
 2.11.0
@@ -1,102 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Antonio Russo <antonio.e.russo@gmail.com>
 Date: Fri, 18 May 2018 18:04:51 -0400
 Subject: [PATCH] Expand zfs-test and add Breaks/Conflicts
 ---
 debian/control                | 4 ++--
 debian/control.in             | 4 ++--
 debian/tests/control          | 2 +-
 debian/zfs-test.install       | 6 +++++-
 debian/zfsutils-linux.install | 5 +----
 5 files changed, 11 insertions(+), 10 deletions(-)
 diff --git a/debian/control b/debian/control
 index 9e4f8fa7..8d85529c 100644
 --- a/debian/control
 +++ b/debian/control
@@ -180,8 +180,8 @@ Depends: acl,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 -Breaks: zfsutils-linux (<= 0.6.5.11-1)
 -Replaces: zfsutils-linux (<= 0.6.5.11-1)
 +Breaks: zfsutils-linux (<= 0.7.9-2)
 +Replaces: zfsutils-linux (<= 0.7.9-2)
 Conflicts: zutils
 Description: OpenZFS test infrastructure an support scripts
  The Z file system is a pooled filesystem designed for maximum data
 diff --git a/debian/control.in b/debian/control.in
 index e193f017..9970875e 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -180,8 +180,8 @@ Depends: acl,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 -Breaks: zfsutils-linux (<= 0.6.5.11-1)
 -Replaces: zfsutils-linux (<= 0.6.5.11-1)
 +Breaks: zfsutils-linux (<= 0.7.9-2)
 +Replaces: zfsutils-linux (<= 0.7.9-2)
 Conflicts: zutils
 Description: OpenZFS test infrastructure an support scripts
  The Z file system is a pooled filesystem designed for maximum data
 diff --git a/debian/tests/control b/debian/tests/control
 index 3d704bac..d03b365b 100644
 --- a/debian/tests/control
 +++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: kernel-smoke-test
 Restrictions: needs-root
 -Depends: zfsutils-linux, zfs-zed, zfs-initramfs, zfs-dkms
 +Depends: zfsutils-linux, zfs-zed, zfs-initramfs, zfs-dkms, zfs-test
 diff --git a/debian/zfs-test.install b/debian/zfs-test.install
 index 225d51fc..ec850df8 100644
 --- a/debian/zfs-test.install
 +++ b/debian/zfs-test.install
@@ -1,8 +1,12 @@
 +sbin/zinject
 +sbin/zpios
 sbin/ztest
 usr/bin/raidz_test
 -usr/share/man/man1/ztest.1
 usr/share/man/man1/raidz_test.1
 usr/share/man/man1/test-runner.1
 +usr/share/man/man1/zpios.1
 +usr/share/man/man1/ztest.1
 +usr/share/man/man8/zinject.8
 usr/share/zfs/common.sh
 usr/share/zfs/common.sh
 usr/share/zfs/common.sh
 diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
 index 238e00a2..18016822 100644
 --- a/debian/zfsutils-linux.install
 +++ b/debian/zfsutils-linux.install
@@ -15,8 +15,6 @@ sbin/mount.zfs
 sbin/zdb
 sbin/zfs
 sbin/zhack
 -sbin/zinject
 -sbin/zpios
 sbin/zpool
 sbin/zstreamdump
 usr/bin/zgenhostid
@@ -25,7 +23,7 @@ usr/lib/zfs-linux/zpool.d/
 usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
 -usr/share/man/man1/
 +usr/share/man/man1/zhack.1
 usr/share/man/man5/
 usr/share/man/man8/fsck.zfs.8
 usr/share/man/man8/mount.zfs.8
@@ -33,6 +31,5 @@ usr/share/man/man8/vdev_id.8
 usr/share/man/man8/zdb.8
 usr/share/man/man8/zfs.8
 usr/share/man/man8/zgenhostid.8
 -usr/share/man/man8/zinject.8
 usr/share/man/man8/zpool.8
 usr/share/man/man8/zstreamdump.8
 -- 
 2.11.0
@@ -0,0 +1,143 @@
 Index: new/debian/control.in
 ===================================================================
 --- new.orig/debian/control.in	2015-10-09 10:02:40.000000000 +0200
 +++ new/debian/control.in	2015-10-09 10:15:36.000000000 +0200
@@ -104,39 +104,9 @@
  This package provides the source to the SPL kernel module in a form
  suitable for use by module-assistant or kernel-package.
 -Package: zfs-dkms
 -Architecture: all
 -Pre-Depends: spl-dkms
 -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}, file
 -Recommends: zfsutils
 -Replaces: lzfs, lzfs-dkms, zfs-modules-source
 -Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules, zfs-modules-source
 -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
 - checksums.
 - .
 - This DKMS package includes the SPA, DMU, ZVOL, and ZPL components of ZFS.
 -
 -Package: zfs-dracut
 -Section: utils
 -Architecture: linux-any
 -Depends: dracut,
 - zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version}),
 - zfsutils, ${misc:Depends}
 -Description: Native ZFS root filesystem capabilities for Linux
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
 - checksums.
 - .
 - This package adds ZFS to the system initramfs with a hook
 - for the dracut infrastructure.
 -
 Package: zfs-initramfs
 Architecture: linux-any
 Depends: initramfs-tools, busybox,
 - zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version}),
  zfsutils, ${misc:Depends}
 Description: Native ZFS root filesystem capabilities for Linux
  The Z file system is a pooled filesystem designed for maximum data
@@ -150,7 +120,6 @@
 Section: admin
 Architecture: linux-any
 Depends: initscripts, lsb-base, python, ${misc:Depends}, ${shlibs:Depends}
 -Recommends: zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version})
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Replaces: zfs
 Index: new/debian/rules
 ===================================================================
 --- new.orig/debian/rules	2015-10-09 10:02:40.000000000 +0200
 +++ new/debian/rules	2015-10-09 10:14:14.000000000 +0200
@@ -25,12 +25,10 @@
 endif
 ifndef SPL
 -SPLSRC=/usr/src/spl-$(VERSION)
 +SPLSRC=../pkg-spl
 endif
 -CFG_OPTS=--with-linux=$(KSRC) \
 -	 --with-linux-obj=$(KOBJ) \
 -	 --with-spl=$(SPLSRC)
 +CFG_OPTS=--with-spl=$(SPLSRC)
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 PACKAGE=zfs
@@ -83,42 +81,6 @@
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 -	@# Get a bare copy of the source code for DKMS.
 -	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree, which does not
 -	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
 -	$(MAKE) distdir
 -
 -	@# Install the DKMS source.
 -	@# We only want the files needed to build the modules
 -	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
 -	touch '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/.nogitrelease'
 -	cp '$(CURDIR)/autogen.sh' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/'
 -	( for d in include module config; do \
 -	     rm -Rf $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/$$d; \
 -	done)
 -	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
 -	@# Hellish awk line:
 -	@#  * Deletes from configure.ac the parts not needed for building the kernel module
 -	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
 -	@#        (Makefile$|include/|module/|*.release$)
 -	@#  * Takes care of spaces and tabs
 -	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
 -		'$(CURDIR)/$(NAME)-$(VERSION)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/configure.ac'
 -	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
 -	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
 -		'$(CURDIR)/$(NAME)-$(VERSION)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Sanity test
 -	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Run autogen on the stripped source tree
 -	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
 -	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache'
 -
 -	@# This shunt allows DKMS to install the Module.symvers and zfs_config.h
 -	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 -	echo '#!/bin/sh'  >'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -	echo 'cp "$$@"'  >>'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
 	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
 		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
@@ -137,28 +99,6 @@
 	# Fix the includes according to https://github.com/zfsonlinux/zfs/issues/2903
 	./debian/fix_includes-libspl.sh
 -	@# Duplicate the dkms directory for module-assistant source package
 -	install -d $(CURDIR)/debian/tmp/usr/src/modules
 -	cp -r $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION) $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)
 -	mkdir -p $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian
 -	cp debian/copyright debian/module/* \
 -	    $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/
 -	sed 's/^zfs-linux /zfs-modules /' debian/changelog \
 -	    > $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/changelog
 -	chmod 755 $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/rules
 -	chown -R root.src $(CURDIR)/debian/tmp
 -	find $(CURDIR)/debian/tmp/usr/src -type d | xargs chmod 755
 -	find $(CURDIR)/debian/tmp/usr/src -type f -perm -100 | xargs chmod 755
 -	find $(CURDIR)/debian/tmp/usr/src -type f -not -perm -100 | xargs chmod 644
 -	chmod 775 $(CURDIR)/debian/tmp/usr/src/modules
 -	cd $(CURDIR)/debian/tmp/usr/src && tar cf $(PACKAGE).tar modules
 -	rm -Rf $(CURDIR)/debian/tmp/usr/src/modules
 -	bzip2 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar
 -	chmod 644 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2
 -	install -d $(CURDIR)/debian/zfs-modules-source/usr/src
 -	mv $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2 $(CURDIR)/debian/zfs-modules-source/usr/src/
 -	rm -Rf $(CURDIR)/debian/zfs-modules-source/usr/src/$(NAME)-$(VERSION)
 -
 override_dh_installinit:
 	@# Install systemd files
 	dh_systemd_enable -pzfsutils etc/systemd/system/zfs.target
@@ -1,4 +1,2 @@
-0001-remove-DKMS-modules-and-dracut-build.patch
+fix-control.patch
-0002-import-with-d-dev-disk-by-id-in-scan-service.patch
+skip-unneeded-pull-requests.patch
 0003-always-load-ZFS-module-on-boot.patch
 0004-Expand-zfs-test-and-add-Breaks-Conflicts.patch
@@ -0,0 +1,21 @@
 diff --git a/debian/patches/series b/debian/patches/series
 index ffafe6c..9823273 100644
 --- a/debian/patches/series
 +++ b/debian/patches/series
@@ -1,12 +1,12 @@
 0002-Prevent-manual-builds-in-the-DKMS-source.patch
 0005-Remove-userland-dist-rules.patch
 libzfs-dependencies
 -PR1099.patch
 -PR1476.patch
 +#PR1099.patch
 +#PR1476.patch
 PR1867.patch
 PR2668.patch
 -PR2790.patch
 -PR3238.patch
 +#PR2790.patch
 +#PR3238.patch
 PR3465.patch
 PR3559.patch
 PR3560.patch
Author	SHA1	Message	Date
Fabian Grünbichler	93440c1975	bump version, update changelog	2016-06-28 15:41:47 +02:00
Fabian Grünbichler	8d4db41b48	fix make upload target	2016-06-28 15:27:06 +02:00
Fabian Grünbichler	d5aecb0120	add make deb target	2016-06-28 14:35:56 +02:00
Fabian Grünbichler	787eca93c4	update make upload target	2016-06-28 14:35:35 +02:00
Fabian Grünbichler	e2380c2a18	update source archives	2016-06-28 14:35:23 +02:00
Fabian Grünbichler	9ccb7a65af	update changelogs	2016-06-28 14:35:12 +02:00
Fabian Grünbichler	b6cafe691d	update changelogs	2016-06-28 13:51:08 +02:00
Fabian Grünbichler	6d5485395f	drop unneeded/non-upstream pull requests - #1099: iSCSI support for ZoL - #1476: Change sharesmb to use REGISTRY shares for better control by user/admin - #2790: Rewrite of nfs.c to keep options per host separated. - #3238: Allow "zfs unshare <proto> -a" much like "zfs share <proto> -a" (WIP)	2016-06-28 13:50:15 +02:00
Fabian Grünbichler	e34fbf907c	update to zfs/spl 0.6.5.7 update pkg-zfs to zfs-0.6.5.7-8-wheezy update pkg-spl to spl-0.6.5.7-3-wheezy change package versioning scheme drop cherry-pick workarounds	2016-06-28 13:49:32 +02:00
Dietmar Maurer	a96c6ce442	update to zfs/spl 0.6.5.6	2016-03-30 11:34:48 +02:00
Dietmar Maurer	a0ba3b44a3	update to 0.6.5.4	2016-01-17 15:32:47 +01:00
Dietmar Maurer	8b01c7a110	update to 0.6.5.2	2015-10-09 10:25:57 +02:00
Dietmar Maurer	69aebd7324	update to 0.6.4.2	2015-07-21 08:01:23 +02:00
Dietmar Maurer	0ca48f6b95	update to 0.6.4.1	2015-04-30 07:32:22 +02:00
Dietmar Maurer	4b9f6205df	fix typo	2015-04-14 10:20:51 +02:00
Dietmar Maurer	ead682fb07	remove DKMS settings from /etc/default/zfs	2015-04-14 08:00:31 +02:00
Dietmar Maurer	2f2b265609	fix changelogs	2015-04-14 07:56:26 +02:00
Dietmar Maurer	cefdaf9301	remove unused files	2015-04-13 08:35:28 +02:00
Dietmar Maurer	e37bd2ebdc	use packages from github	2015-04-13 08:31:33 +02:00
Dietmar Maurer	cc8c8584d9	bump version to 0.6.4-1~wheezy	2015-04-12 09:40:23 +02:00
Dietmar Maurer	532f0e92a0	update sources to 0.6.4	2015-04-12 09:27:14 +02:00
Dietmar Maurer	67f0ab4538	set RELEASE=3.4	2015-03-15 15:01:54 +01:00
Dietmar Maurer	eb1b8b66b7	bump zfs package version to 0.6.3-3	2015-03-15 14:57:38 +01:00
Dietmar Maurer	a7c83d2c0c	install init.d file for zed	2015-03-15 14:55:53 +01:00
`@@ -10,4 +10,4 @@ modules with the kernel.`

	`For licensing questions, see:`	`For licensing questions, see:`

	`http://open-zfs.org/wiki/Talk:FAQ`	`http://open-zfs.org/wiki/Talk:FAQ`
`@@ -1 +1 @@`
	`0001-remove-DKMS-and-module-build.patch`	`fix-control`