update make upload target

2017-03-10 09:36:44 +01:00
66 changed files with 1111 additions and 6270 deletions
@@ -1,3 +0,0 @@
-[submodule "zfs/upstream"]
-	path = upstream
-	url = ../mirror_zfs
@@ -1,13 +1,23 @@
+RELEASE=4.1
+
 # source form https://github.com/zfsonlinux/

-ZFSPKG=debian
-ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
-ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
-ZFSDIR=zfs-linux_${ZFSVER}
-ZFSSRC=upstream
+ZFSVER=0.6.5.9
+ZFSPKGREL=pve15~bpo80
+SPLPKGREL=pve8~bpo80
+ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
+SPLPKGVER=${ZFSVER}-${SPLPKGREL}

-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
-ZFS_DEB2= 					\
+SPLDIR=pkg-spl
+SPLSRC=pkg-spl.tar.gz
+ZFSDIR=pkg-zfs
+ZFSSRC=pkg-zfs.tar.gz
+
+SPL_DEBS= 					\
+spl_${SPLPKGVER}_amd64.deb
+
+ZFS_DEBS= 					\
+libnvpair1linux_${ZFSPKGVER}_amd64.deb		\
 libuutil1linux_${ZFSPKGVER}_amd64.deb		\
 libzfs2linux_${ZFSPKGVER}_amd64.deb		\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
@@ -15,58 +25,63 @@ libzpool2linux_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
 zfs-zed_${ZFSPKGVER}_amd64.deb			\
 zfs-initramfs_${ZFSPKGVER}_all.deb		\
-zfs-test_${ZFSPKGVER}_amd64.deb		\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb
-ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
-ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc

-all: deb
-.PHONY: deb
-deb: ${ZFS_DEBS}
-.PHONY: dsc
-dsc: ${ZFS_DSC}
+ZFS_TRANS_DEBS=					\
+libnvpair1_${ZFSPKGVER}_all.deb			\
+libuutil1_${ZFSPKGVER}_all.deb			\
+libzfs2_${ZFSPKGVER}_all.deb			\
+libzpool2_${ZFSPKGVER}_all.deb			\
+zfsutils_${ZFSPKGVER}_all.deb

-# called from pve-kernel's Makefile to get patched sources
-.PHONY: kernel
-kernel: dsc
-	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
-	$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
+DEBS=${SPL_DEBS} ${ZFS_DEBS} ${ZFS_TRANS_DEBS}
+
+all: ${DEBS}

 .PHONY: dinstall
 dinstall: ${DEBS}
 	dpkg -i ${DEBS}

-.PHONY: submodule
-submodule:
-	test -f "$(ZFSSRC)/README.md" || git submodule update --init
-$(ZFSSRC)/README.md: submodule
+.PHONY: spl
+spl ${SPL_DEBS}: ${SPLSRC}
+	rm -rf ${SPLDIR}
+	tar xf ${SPLSRC}
+	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}; dpkg-buildpackage -b -uc -us 

 .PHONY: zfs
-zfs: $(ZFS_DEBS)
-$(ZFS_DEB2): $(ZFS_DEB1)
-$(ZFS_DEB1): ${ZFSDIR}
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-	lintian ${ZFS_DEBS}
-
-${ZFS_DSC}: ${ZFSDIR}
-	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
-	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
-	lintian $@
-
-${ZFSDIR}: $(ZFSSRC)/README.md $(ZFSSRC) ${ZFSPKG}
+zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
 	rm -rf ${ZFSDIR}
-	mkdir ${ZFSDIR}
-	cp -a ${ZFSSRC}/* ${ZFSDIR}/
-	cp -a ${ZFSPKG} ${ZFSDIR}/debian
+	tar xf ${ZFSSRC}
+	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 

+.PHONY: download
+download:
+	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
+	# clone pkg-zfsonlinux/spl and checkout 0.6.5.9-1
+	git clone -b debian/0.6.5.9-1 git://anonscm.debian.org/pkg-zfsonlinux/spl.git pkg-spl
+	# clone pkg-zfsonlinux/zfs and checkout 0.6.5.9-2
+	git clone -b debian/0.6.5.9-2 git://anonscm.debian.org/pkg-zfsonlinux/zfs.git pkg-zfs
+	tar czf ${SPLSRC} pkg-spl
+	tar czf ${ZFSSRC} pkg-zfs

 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR}
+	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}

 .PHONY: distclean
 distclean: clean

+
 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch amd64
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist jessie
@@ -2,8 +2,8 @@ Proxmox VE packaging for ZFS on Linux

 This is based on code from:

-https://salsa.debian.org/zfsonlinux-team/zfs
-https://salsa.debian.org/zfsonlinux-team/spl
+https://github.com/zfsonlinux/pkg-spl.git
+https://github.com/zfsonlinux/pkg-zfs.git

 We removed the dkms/modules related code, because we ship the
 modules with the kernel.
@@ -1,726 +0,0 @@
-zfs-linux (0.8.1-pve2) pve pmg; urgency=medium
-
-  * cherry-pick parallel mount fix
-
-  * cherry-pick SIMD compat patches
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Aug 2019 17:10:11 +0200
-
-zfs-linux (0.8.1-pve1) pve pmg; urgency=medium
-
-  * update ZFS to 0.8.1
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 14 Jun 2019 20:43:10 +0200
-
-zfs-linux (0.8.0-pve1) pve pmg; urgency=medium
-
-  * update ZFS to 0.8.0
-
-  * SPL is now included in upstream ZFS packaging.
-    Build dummy spl and spl-dkms packages to ease transition on upgrades.
-
-  * Build pyzfs+documentation package
-
-  * Use arc_summary3.py to provide arc_summary.
-
-  * shipped python scripts now use python3
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 24 May 2019 12:05:22 +0200
-
-zfs-linux (0.7.13-pve2~bpo2) pve pmg; urgency=medium
-
-  * rebuild for PVE 6.0 / Debian Buster
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 21 May 2019 20:08:45 +0200
-
-zfs-linux (0.7.13-pve1~bpo2) unstable; urgency=medium
-
-  * remove conflict with insserv  (<< 1.18)
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 27 Mar 2019 09:56:15 +0100
-
-zfs-linux (0.7.13-pve1~bpo1) unstable; urgency=medium
-
-  * update ZFS to 0.7.13
-
-  * base zfs-linux on upstream ZOL instead of debian
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Mar 2019 06:53:00 +0100
-
-zfs-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
-
-  * update ZFS to 0.7.12
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
-
-zfs-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
-
-  * update ZFS to debian/0.7.11-3
-
-  * Cherry-pick two fixes planned for 0.7.12
-
-  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
-    fault
-
-  * Fix missing Breaks/Replaces in zfs-initramfs
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:45:49 +0100
-
-zfs-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
-
-  * update ZFS to 0.7.11
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:31 +0200
-
-zfs-linux (0.7.9-pve3~bpo9) unstable; urgency=medium
-
-  *  Cherry-pick fix for deadlock umount/snapentry_expire
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 03 Aug 2018 11:41:11 +0200
-
-zfs-linux (0.7.9-pve2~bpo9) unstable; urgency=medium
-
-  * Cherry-pick fix for zpl_mount deadlock
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 12 Jul 2018 12:37:50 +0200
-
-zfs-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
-
-  * update ZFS to 0.7.9
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
-
-zfs-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
-
-  * update ZFS to 0.7.8 (no changes)
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
-
-zfs-linux (0.7.7-pve2~bpo9) unstable; urgency=medium
-
-  * (temporarily) revert likely cause of #7401
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 9 Apr 2018 09:49:27 +0200
-
-zfs-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
-
-  * update ZFS to 0.7.7
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
-
-zfs-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
-
-  * update ZFS to 0.7.6
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:48:29 +0100
-
-zfs-linux (0.7.4-pve2~bpo9) unstable; urgency=medium
-
-  * cherry-pick ARC hit rate fix from 0.7.6
-
-  * always load ZFS modules on boot
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Jan 2018 11:31:14 +0100
-
-zfs-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
-
-  * update ZFS to 0.7.4
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
-
-zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
-
-  * update ZFS to 0.7.3
-
-  * include fix for user namespace setgid issue (#6800 upstream)
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
-
-zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
-
-  * update zfs to 0.7.2
-
-  * add PR 6616 - zfs send/recv compatibility with 0.6.5
-
-  * add PR 6695 - zfs recv: don't skip over objects which should be freed
-
-  * 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
-
-  * use /sbin/modprobe to avoid warning inside initrd
-
-  * fix warning about undefined values inside initrd
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
-
-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
-
-zfs-linux (0.7.12-2) unstable; urgency=medium
-
-  [ Colin Ian King ]
-  * Only run autopkgtests for amd64, arm64, ppc64el and s390x (LP#1805627).
-
-  [ Martin Bagge / brother ]
-  * [INTL:sv] Swedish strings for zfs-linux debconf (Closes: #918020)
-
-  [ Anders Jonsson ]
-  * sv.po: typo fix
-
-  [ Mo Zhou ]
-  * Change init script's behaviour to default during postinst.
-  * Add ${perl:Depends} to zfs-dkms's Depends.
-  * Add autopkgtest script to test zfs-dkms build.
-  * autopkgtest: minor fix
-
-  [ Aron Xu ]
-  * Add XS-Autobuild: yes to d/control
-  * Conflicts with insserv << 1.18 (Closes: #915831)
-
- -- Aron Xu <aron@debian.org>  Fri, 11 Jan 2019 21:32:06 +0800
-
-zfs-linux (0.7.12-1) unstable; urgency=medium
-
-  [ Stoiko Ivanov ]
-  * Add Breaks/Replaces to zfs-initramfs
-
-  [ Mo Zhou ]
-  * New upstream version 0.7.12
-  * Drop unnecessary patch init-start-stop-dep-on-local-fs.patch .
-  * Override init.d-script-missing-dependency-on-local_fs for zfs-zed.
-  * Bump linux compatibility to 4.19 .
-
- -- Mo Zhou <cdluminate@gmail.com>  Mon, 19 Nov 2018 11:32:44 +0000
-
-zfs-linux (0.7.11-3) unstable; urgency=medium
-
-  [ Antonio Russo ]
-  + https://salsa.debian.org/zfsonlinux-team/zfs/merge_requests/9
-  * Break/Replace upstream .deb packages (Closes: #839921)
-  * Install upstream bash completion file instead of embedded one.
-  * Modify META before autoreconf.
-  * Make dkms distdir before build to avoid including build artifacts.
-  * Remove ZFS_AC_PACKAGE macros from DKMS sources.
-    This removes dpkg-dev dependency from zfs-dkms package.
-  * Use upstream's dkms.mkconf script to produce dkms.conf .
-  * Ship initramfs zdev hook in zfs-initramfs (Closes: #902052)
-
-  [ Nicolas Braud-Santoni ]
-  * Update debian/copyright, removing unused wildcards.
-
-  [ Nicholas D Steeves ]
-  * Change -dbg package's priority from extra to optional.
-
-  [ Mo Zhou ]
-  * Fix FTBFS on architecture=all due to FileNotFound. (Closes: #911937)
-  * Add isolation-machine restriction to autopkgtest because the tests
-    needs to interact with the kernel, i.e. loading kernel module.
-
- -- Mo Zhou <cdluminate@gmail.com>  Sun, 28 Oct 2018 10:28:52 +0000
-
-zfs-linux (0.7.11-2) unstable; urgency=medium
-
-  * Support Devuan in dkms script. (Closes: #900089)
-    Thanks to Chris Dos <chris@chrisdos.com>
-  * Install init scripts to support non-systemd setups. (Closes: #826994)
-    Thanks to Chris Dos <chris@chrisdos.com>
-  * Override init.d-script-does-not-source-init-functions for
-    zfsutils-linux and zfs-zed.
-  * Patch upstream init scripts to make them work for Debian+OpenRC setup.
-  * Patch upstream init script to fix missing dependency on local_fs.
-
- -- Mo Zhou <cdluminate@gmail.com>  Fri, 26 Oct 2018 09:32:06 +0000
-
-zfs-linux (0.7.11-1) unstable; urgency=medium
-
-  [ Aron Xu ]
-  * Add dpkg-dev to Depends of zfs-dkms (Closes: #900714)
-
-  [ Nicolas Braud-Santoni ]
-  * Use canonical HTTPS format URL for Vcs-Git (Closes: #895873)
-
-  [ Mo Zhou ]
-  * New upstream version 0.7.11 (Closes: #908290)
-  * Bump linux_compat to 4.18 .
-  * Replace get_next.sh with one-liner awk script in rules.
-  * Append myself to Uploaders and refresh auto-generated control.
-  * Use HTTPS format URI in watch file.
-  * Recommends linux-libc-dev (<< LINUX_NEXT~) instead of (<< LINUX_NEXT).
-
- -- Mo Zhou <cdluminate@gmail.com>  Wed, 19 Sep 2018 08:45:18 +0000
-
-zfs-linux (0.7.9-3) unstable; urgency=medium
-
-  [ Antonio Russo ]
-  * Expand zfs-test and add Breaks/Conflicts (Closes: #899047)
-
-  [ Aron Xu ]
-  * d/control: migrate to alioth-lists (Closes: #899756)
-
- -- Aron Xu <aron@debian.org>  Mon, 28 May 2018 18:22:02 +0800
-
-zfs-linux (0.7.9-2) unstable; urgency=medium
-
-  [ Aron Xu ]
-  * Move more zfs test tools to zfs-test package (Closes: #868653)
-  * New upstream version 0.7.9
-  * d/rules: add --enable-systemd
-  * Fix lintian obsolete-relation-form-in-source
-  * Bump supported linux version to 4.16
-
-  [ Antonio Russo ]
-  * Install enum-extract.pl with dkms
-  * Handle /proc/kallsym obfuscation (Closes: #891936)
-
- -- Aron Xu <aron@debian.org>  Thu, 17 May 2018 23:47:29 +0800
-
-zfs-linux (0.7.6-1) unstable; urgency=medium
-
-  [ Lev Lamberov ]
-  * [INTL:ru] Updated Russian translation of debconf (Closes: #885990)
-
-  [ Aron Xu]
-  * New upstream release (Closes: #889795, #890576)
-  * 0001-Fix-bug-in-distclean-which-removes-needed-files.patch:
-    removed, applied upstream
-  * Update VCS-* URL to salsa.debian.org
-  * Apply wrap-and-sort
-  * Recommends: linux-libc-dev (< ${LINUX_NEXT}):
-    Tries to prevent unexpected upgrades of kernel that is not known to
-    be supported by the packaged version of ZFS/SPL. (Closes: #849420)
-
- -- Aron Xu <aron@debian.org>  Mon, 26 Feb 2018 16:32:29 +0800
-
-zfs-linux (0.7.5-1) unstable; urgency=medium
-
-  [ Aron Xu ]
-  * New upstream version 0.7.5 (Closes: #884812)
-
-  [ Antonio Russo ]
-  * Add version dependency on zfsutils-linux package (Closes: #880889)
-
- -- Aron Xu <aron@debian.org>  Fri, 19 Jan 2018 15:39:23 +0800
-
-zfs-linux (0.7.4-1) unstable; urgency=medium
-
-  * New upstream version 0.7.4 (Closes: #884287, #883832)
-  * Require debhelper >= 10.2
-  * cherry-pick: fix distclean which removes needed files (Closes: #884706)
-  * Refresh patches
-  * Update stdver to 4.1.2, no change required
-  * Install zfs-import.target
-
- -- Aron Xu <aron@debian.org>  Mon, 18 Dec 2017 22:48:59 +0800
-
-zfs-linux (0.7.3-3) unstable; urgency=medium
-
-  [ Antonio Russo ]
-  * Add maximum version dependency on spl-dkms (Closes: #883008)
-
- -- Aron Xu <aron@debian.org>  Thu, 30 Nov 2017 00:34:30 +0800
-
-zfs-linux (0.7.3-2) unstable; urgency=medium
-
-  [ Fabian Grünbichler ]
-  * d/rules: remove obsolete calls to dpkg-architecture (Closes: #882209)
-  * zfs-test: add proper Breaks+Replaces (Closes: #880902)
-  * build: add implicit version to dh_makeshlibs (Closes: #880709)
-
-  [ Aron Xu ]
-  * Depend on matching version of spl-dkms (Closes: ##881013)
-
- -- Aron Xu <aron@debian.org>  Tue, 28 Nov 2017 16:16:34 +0800
-
-zfs-linux (0.7.3-1) unstable; urgency=medium
-
-  [ Antonio Russo ]
-  * Refresh manual builds DKMS prevention patch
-
-  [ Fabian Grünbichler ]
-  * zfs-test package
-  * add files to debian/not-installed
-  * dh_install: switch to --fail-missing
-  * add new files from 0.7 to install
-  * dkms: build icp module as well
-
-  [ Antonio Russo ]
-  * dracut: make module-setup.sh shebang explicit
-  * add man page reference to systemd units
-  * Fix install path of zpool.d scripts
-  * Incorporate DebianPT.org Portuguese translation
-  * Fix typo in debconf templates
-  * Drop dependency on dh-systemd
-
-  [ Aron Xu ]
-  * Drop merged patches, update remainders
-  * Update std-ver to 4.1.1
-  * New upstream version 0.7.3
-  * Update debconf pot file
-  * Update control.in for dh-systemd deprecation
-  * Add lintian override for zfs-test
-
-  [ Colin King ]
-  * Improve cloning performance for large numbers of clones (LP: #1567557)
-    Bump zcmd buffer from 16K to 256K.
-
- -- Aron Xu <aron@debian.org>  Tue, 31 Oct 2017 18:52:01 +0800
-
-zfs-linux (0.6.5.11-1) unstable; urgency=medium
-
-  [ Aron Xu ]
-  * Imported Upstream version 0.6.5.11
-
-  [ Fabian Grünbichler ]
-  * fix rm path in zfs-share.service
-
- -- Aron Xu <aron@debian.org>  Fri, 14 Jul 2017 16:33:23 +0800
-
-zfs-linux (0.6.5.10-1) unstable; urgency=medium
-
-  * Add kernel version to depmod cmd (Closes: #860958)
-  * New upstream version 0.6.5.10
-
- -- Aron Xu <aron@debian.org>  Wed, 05 Jul 2017 18:11:39 +0800
-
-zfs-linux (0.6.5.9-5) unstable; urgency=medium
-
-  * Add zfs initramfs conf for root pool setup
-    (Closes: #848157, LP: #1673197)
-
- -- Aron Xu <aron@debian.org>  Sun, 19 Mar 2017 18:14:57 +0800
-
-zfs-linux (0.6.5.9-4) unstable; urgency=medium
-
-  * autopkgtest: load zfs module before running tests
-
- -- Aron Xu <aron@debian.org>  Tue, 14 Mar 2017 11:38:08 +0800
-
-zfs-linux (0.6.5.9-3) unstable; urgency=medium
-
-  [ Petter Reinholdtsen ]
-  * Updated German debconf translation by Helge Kreutzmann. (Closes: #857528)
-  * Updated metadata on a few patches.
-
-  [ Aron Xu ]
-  * Cherry-pick upstream fix for merged /usr/lib and /lib
-  * Manually maintain adt test Depends
-
- -- Aron Xu <aron@debian.org>  Mon, 13 Mar 2017 12:23:32 +0800
-
-zfs-linux (0.6.5.9-2) unstable; urgency=medium
-
-  [ Fabian Grünbichler ]
-  * fix zed-service-bindir patch
-
- -- Aron Xu <aron@debian.org>  Tue, 07 Feb 2017 17:22:02 +0800
-
-zfs-linux (0.6.5.9-1) unstable; urgency=medium
-
-  [ Aron Xu ]
-  * Imported Upstream version 0.6.5.9 (Closes: #851513)
-
-  [ Lukas Wunner ]
-  * Cherry picks for root zpool with dracut (Closes: #849969)
-  * Fix installation path of systemd files
-  * Fix build breakage caused by nonstandard umask
-
-  [ Fabian Grünbichler ]
-  * fix python script install path (Closes: #842237)
-
- -- Aron Xu <aron@debian.org>  Mon, 06 Feb 2017 15:57:50 +0800
-
-zfs-linux (0.6.5.8-3) unstable; urgency=medium
-
-  * Fix the path on the zfs-zed unit file (Closes: #849813)
-
- -- Carlos Alberto Lopez Perez <clopez@igalia.com>  Thu, 05 Jan 2017 16:23:16 +0100
-
-zfs-linux (0.6.5.8-2) unstable; urgency=medium
-
-  [ Richard Laager ]
-  * Remove .py extension from utilities in /usr/sbin as per policy
-    10.4 Scripts (LP: #1628279)
-
-  [ Colin Ian King ]
-  * Use python3 for arcstat.py, arc_summary.py & dbufstat.py (LP: #1627909)
-
-  [ Richard Laager ]
-  * Set PATH in cron.d job to fix monthly scrubs. (LP: #1548009)
-
-  [ Aron Xu ]
-  * Install zed into /usr/sbin
-  * Rename zfsutils path to follow the package name
-  * Add missing part in python3 move
-  * Install zed to /usr/sbin
-
-  [ Petter Reinholdtsen ]
-  * Updated Italian debconf translation by Beatrice Torracca.
-    (Closes: #846928)
-  * Added patch 1003-linux-4.9-compat.patch from upstream to build with
-    Linux kernel 4.9. (Closes: #847018)
-
- -- Aron Xu <aron@debian.org>  Sat, 17 Dec 2016 17:42:21 +0800
-
-zfs-linux (0.6.5.8-1) unstable; urgency=medium
-
-  [ Carlos Alberto Lopez Perez ]
-  * Reflow changelog from last upload to avoid lintian warning.
-
-  [ Aron Xu ]
-  * Imported Upstream version 0.6.5.8 (Closes: #838192)
-  * Conflicts with zutils (Closes: #836853)
-
-  [ Zhou Mo ]
-  * Patch: remove merged patches.
-  * Upstream renamed zed.service to zfs-zed.service .
-  * Avoid installing zfs-zed.service twice.
-
- -- Aron Xu <aron@debian.org>  Tue, 20 Sep 2016 15:20:21 +0800
-
-zfs-linux (0.6.5.7-2) unstable; urgency=medium
-
-  [ Aron Xu ]
-  * Add busybox to zfs-initramfs list of dependencies. (Closes: #824976)
-
-  [ Petter Reinholdtsen ]
-  * Updated Danish debconf translation by Joe Hansen. (Closes: #830652)
-  * Added Dutch (nl) debconf translation by Frans Spiesschaert.
-    (Closes: #832280)
-  * Norwegian Bokmål (nb) debconf template translation by Petter Reinholdtsen.
-
-  [ Eric Desrochers ]
-  * Change utilities path (bindir) to /usr/sbin. (Closes: #832938)
-
-  [ Carlos Alberto Lopez Perez]
-  * Add tunable to ignore hole_birth, and enable it by default.
-    (Closes: #830824)
-
- -- Carlos Alberto Lopez Perez <clopez@igalia.com>  Tue, 16 Aug 2016 17:43:48 +0200
-
-zfs-linux (0.6.5.7-1) unstable; urgency=medium
-
-  [ YunQiang Su ]
-  * 1002-fix-mips-build.patch: fix builds on mips* archs
-
-  [ Aron Xu ]
-  * New upstream release.
-  * 1001-Fix-aarch64-compilation.patch: dropped, not needed anymore
-  * Merge patches from Ubuntu:
-    - 0002-Check-for-META-and-DCH-consistency-in-autoconf.patch
-    - 0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
-    - enable-zed.patch
-
- -- Aron Xu <aron@debian.org>  Tue, 31 May 2016 14:10:49 +0800
-
-zfs-linux (0.6.5.6-2) unstable; urgency=medium
-
-  [ Aron Xu ]
-  * Adding smoke testing scripts from Ubuntu
-  * Fix binary module builds
-  * Add libblkid-dev, libattr1-dev to build-dep
-  * Re-sync source tree
-  * Add dh-python to b-d
-  * Remove .gitignore files and clean build tree
-  * Scrub all healthy pools monthly from Richard Laager
-
-  [ Petter Reinholdtsen ]
-  * Copied 1000-ppc64el-endian-support.patch from Ubuntu to fix endian
-    build problem on ppc64el
-  * Copied 1001-Fix-aarch64-compilation.patch from Ubuntu to fix build
-    problem on arm64.
-  * Copied 0001-Prevent-manual-builds-in-the-DKMS-source.patch from
-    Ubuntu to block manual building in the DKMS source tree.
-  * Updated Standards-Version from 3.9.7 to 3.9.8.
-  * Bring some files back to the upstream tarball content to get gbp
-    buildpackage working.
-
- -- Petter Reinholdtsen <pere@debian.org>  Thu, 12 May 2016 12:19:55 +0200
-
-zfs-linux (0.6.5.6-1) unstable; urgency=medium
-
-  [ Aron Xu ]
-  * New upstream version 0.6.5.6.
-
-  [ Petter Reinholdtsen ]
-  * Generated new copyright.cme file based on version 0.6.5.6.
-  * Updated d/copyright file, add missing BSD licensed init.d scripts, and
-    new copyright holders in the new upstream version.
-  * Updated Standards-Version from 3.9.6 to 3.9.7.
-  * Added myself as uploader.
-  * Updated debconf po files based on newest pot file.
-  * Correct URL to git repo in d/control.
-
- -- Petter Reinholdtsen <pere@debian.org>  Sat, 26 Mar 2016 07:08:11 +0000
-
-zfs-linux (0.6.5.5-1) unstable; urgency=medium
-
-  * Initial Release (Closes: #686447)
-
- -- Aron Xu <aron@debian.org>  Sun, 20 Mar 2016 22:57:06 +0800
@@ -1 +0,0 @@
-10
@@ -1,249 +0,0 @@
-Source: zfs-linux
-Section: contrib/kernel
-Priority: optional
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 10~),
-               dh-python,
-               libblkid-dev,
-               libssl-dev | libssl1.0-dev,
-               libtool,
-               lsb-release,
-               python3-cffi,
-               python3-setuptools,
-               python3-sphinx,
-               python3-all-dev,
-               uuid-dev,
-               zlib1g-dev
-Standards-Version: 4.1.2
-Homepage: https://www.zfsonlinux.org/
-Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
-Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
-
-Package: libnvpair1linux
-Section: contrib/libs
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libnvpair1
-Replaces: libnvpair1
-Description: Solaris name-value library for Linux
- This library provides routines for packing and unpacking nv pairs for
- transporting data across process boundaries, transporting between
- kernel and userland, and possibly saving onto disk files.
-
-Package: libuutil1linux
-Section: contrib/libs
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libuutil1
-Replaces: libuutil1
-Description: Solaris userland utility library for Linux
- This library provides a variety of glue functions for ZFS on Linux:
-  * libspl: The Solaris Porting Layer userland library, which provides APIs
-    that make it possible to run Solaris user code in a Linux environment
-    with relatively minimal modification.
-  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
-    library.
-  * libefi: The Extensible Firmware Interface library for GUID disk
-    partitioning.
-  * libshare: NFS, SMB, and iSCSI service integration for ZFS.
-
-Package: libzfslinux-dev
-Section: contrib/libdevel
-Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
-         libuutil1linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
-         ${misc:Depends}
-Provides: libnvpair-dev, libuutil-dev
-Description: OpenZFS filesystem development files for Linux
- Header files and static libraries for compiling software against
- libraries of OpenZFS filesystem.
- .
- This package includes the development files of libnvpair1, libuutil1,
- libzpool2 and libzfs2.
-
-Package: libzfs2linux
-Section: contrib/libs
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2
-Replaces: libzfs2
-Description: OpenZFS filesystem library for Linux
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
- .
- The OpenZFS library provides support for managing OpenZFS filesystems.
-
-Package: libzpool2linux
-Section: contrib/libs
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzpool2
-Replaces: libzpool2
-Description: OpenZFS pool library for Linux
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
- .
- This zpool library provides support for managing zpools.
-
-Package: python3-pyzfs
-Section: contrib/python
-Architecture: linux-any
-Depends: ${misc:Depends},
-         ${python3:Depends},
-         python3-cffi,
-         zfsutils-linux (= ${binary:Version})
-Description: wrapper for libzfs_core C library
- libzfs_core is intended to be a stable interface for programmatic
- administration of ZFS. This wrapper provides one-to-one wrappers for
- libzfs_core API functions, but the signatures and types are more natural to
- Python.
- .
- nvlists are wrapped as dictionaries or lists depending on their usage.
- Some parameters have default values depending on typical use for
- increased convenience. Enumerations and bit flags become strings and lists
- of strings in Python. Errors are reported as exceptions rather than integer
- errno-style error codes.  The wrapper takes care to provide one-to-many
- mapping of the error codes to the exceptions by interpreting a context
- in which the error code is produced.
-
-Package: pyzfs-doc
-Section: contrib/doc
-Architecture: all
-Depends:
- ${sphinxdoc:Depends},
- ${misc:Depends}
-Recommends:
- python3-pyzfs
-Description: wrapper for libzfs_core C library (documentation)
- libzfs_core is intended to be a stable interface for programmatic
- administration of ZFS. This wrapper provides one-to-one wrappers for
- libzfs_core API functions, but the signatures and types are more natural to
- Python.
- .
- nvlists are wrapped as dictionaries or lists depending on their usage.
- Some parameters have default values depending on typical use for
- increased convenience. Enumerations and bit flags become strings and lists
- of strings in Python. Errors are reported as exceptions rather than integer
- errno-style error codes.  The wrapper takes care to provide one-to-many
- mapping of the error codes to the exceptions by interpreting a context
- in which the error code is produced.
- .
- This package contains the documentation.
-
-Package: zfs-initramfs
-Architecture: all
-Depends: busybox-initramfs | busybox-static | busybox,
-         initramfs-tools,
-         zfsutils-linux (>= ${binary:Version}),
-         ${misc:Depends}
-Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
-Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
-Description: OpenZFS root filesystem capabilities for Linux - initramfs
- 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 initramfs-tools infrastructure.
-
-Package: zfsutils-linux
-Section: contrib/admin
-Architecture: linux-any
-Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
-Recommends: lsb-base, zfs-zed
-Suggests: nfs-kernel-server,
-          samba-common-bin (>= 3.0.23),
-          zfs-initramfs
-Conflicts: zfs, zfs-fuse
-Provides: zfsutils
-Description: command-line tools to manage OpenZFS filesystems
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
- .
- This package provides the zfs and zpool commands to create and administer
- OpenZFS filesystems.
-
-Package: zfs-zed
-Section: contrib/admin
-Architecture: linux-any
-Depends: zfsutils-linux (>= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: OpenZFS Event Daemon
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
- .
- This package provides the OpenZFS Event Daemon (zed).
-
-Package: zfs-test
-Section: contrib/admin
-Architecture: linux-any
-Depends: acl,
-         bc,
-         fio,
-         ksh,
-         lsscsi,
-         mdadm,
-         parted,
-         python3,
-         python3-pyzfs,
-         sudo,
-         sysstat,
-         zfsutils-linux (>=${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-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
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
- .
- This package provides the OpenZFS test infrastructure for destructively
- testing and validating a system using OpenZFS. It is entirely optional
- and should only be installed and used in test environments.
-
-Package: zfs-dbg
-Section: contrib/debug
-Priority: optional
-Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
-         libuutil1linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
-         zfs-zed (= ${binary:Version}),
-         zfsutils-linux (= ${binary:Version}),
-         ${misc:Depends}
-Description: Debugging symbols for OpenZFS userland libraries and tools
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
- .
- This package contains the debugging symbols for libzpool2linux, libzfs2linux,
- libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
-
-Package: spl
-Section: contrib/metapackages
-Architecture: all
-Depends: ${misc:Depends},
-Suggests: zfs-test
-Description: Solaris Porting Layer user-space utilities for Linux (dummy)
- 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 is a transitional dummy package. It can safely be removed.
@@ -1,2 +0,0 @@
-COPYRIGHT
-LICENSE
@@ -1 +0,0 @@
-lib/libnvpair.so.*
@@ -1 +0,0 @@
-libnvpair1linux: package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
-COPYRIGHT
-LICENSE
@@ -1 +0,0 @@
-lib/libuutil.so.*
@@ -1 +0,0 @@
-libuutil1linux: package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
-COPYRIGHT
-LICENSE
@@ -1,2 +0,0 @@
-lib/libzfs.so.*
-lib/libzfs_core.so.*
@@ -1 +0,0 @@
-libzfs2linux: package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
-COPYRIGHT
-LICENSE
@@ -1,4 +0,0 @@
-lib/*.a usr/lib/
-usr/include
-usr/lib/*.so
-usr/share/pkgconfig/*.pc
@@ -1,2 +0,0 @@
-COPYRIGHT
-LICENSE
@@ -1 +0,0 @@
-lib/libzpool.so.*
@@ -1 +0,0 @@
-libzpool2linux: package-name-doesnt-match-sonames
@@ -1,11 +0,0 @@
-usr/share/zfs/enum-extract.pl
-usr/share/zfs/zfs-helpers.sh
-etc/init.d
-etc/sudoers.d
-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
-etc/zfs/vdev_id.conf.scsi.example
-usr/lib/dracut
-usr/share/zfs/enum-extract.pl
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Debian ZFS on Linux maintainers
- <pkg-zfsonlinux-devel@alioth-lists.debian.net>
-Date: Wed, 30 Jan 2019 15:12:04 +0100
-Subject: [PATCH] Check-for-META-and-DCH-consistency-in-autoconf
-
---
- config/zfs-meta.m4 | 34 +++++++++++++++++++++++++++++-----
- 1 file changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
-index aa0fc1420..f525e2010 100644
--- a/config/zfs-meta.m4
-+++ b/config/zfs-meta.m4
-@@ -1,9 +1,10 @@
- dnl #
- dnl # DESCRIPTION:
-dnl # Read meta data from the META file.  When building from a git repository
-dnl # the ZFS_META_RELEASE field will be overwritten if there is an annotated
-dnl # tag matching the form ZFS_META_NAME-ZFS_META_VERSION-*.  This allows
-dnl # for working builds to be uniquely identified using the git commit hash.
-+dnl # Read meta data from the META file or the debian/changelog file if it
-+dnl # exists.  When building from a git repository the ZFS_META_RELEASE field
-+dnl # will be overwritten if there is an annotated tag matching the form
-+dnl # ZFS_META_NAME-ZFS_META_VERSION-*.  This allows for working builds to be
-+dnl # uniquely identified using the git commit hash.
- dnl #
- dnl #    The META file format is as follows:
- dnl #      ^[ ]*KEY:[ \t]+VALUE$
-@@ -49,6 +50,7 @@ AC_DEFUN([ZFS_AC_META], [
- 	_zfs_ac_meta_type="none"
- 	if test -f "$META"; then
- 		_zfs_ac_meta_type="META file"
-+		_dpkg_parsechangelog=$(dpkg-parsechangelog 2>/dev/null)
- 
- 		ZFS_META_NAME=_ZFS_AC_META_GETVAL([(Name|Project|Package)]);
- 		if test -n "$ZFS_META_NAME"; then
-@@ -69,8 +71,30 @@ AC_DEFUN([ZFS_AC_META], [
- 			AC_SUBST([ZFS_META_VERSION])
- 		fi
- 
-+		if test -n "${_dpkg_parsechangelog}"; then
-+			_dpkg_version=$(echo "${_dpkg_parsechangelog}" \
-+				| $AWK '$[]1 == "Version:" { print $[]2; }' \
-+				| cut -d- -f1)
-+			if test "${_dpkg_version}" != "$ZFS_META_VERSION"; then
-+				AC_MSG_ERROR([
-+	*** Version $ZFS_META_VERSION in the META file is different than
-+	*** version $_dpkg_version in the debian/changelog file. DKMS and DEB
-+	*** packaging require that these files have the same version.
-+				])
-+			fi
-+		fi
-+
- 		ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([Release]);
-		if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
-+
-+		if test -n "${_dpkg_parsechangelog}"; then
-+			_dpkg_release=$(echo "${_dpkg_parsechangelog}" \
-+				| $AWK '$[]1 == "Version:" { print $[]2; }' \
-+				| cut -d- -f2-)
-+			if test -n "${_dpkg_release}"; then
-+				ZFS_META_RELEASE=${_dpkg_release}
-+				_zfs_ac_meta_type="dpkg-parsechangelog"
-+			fi
-+		elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
- 			_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
- 			_alias=$(git describe --match=${_match} 2>/dev/null)
- 			_release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
@@ -1,28 +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>
-Signed-off-by: Stoiko Ivanov <s.ivanov@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 44e1bb3ed..7509b03cb 100644
--- a/etc/modules-load.d/zfs.conf.in
-+++ b/etc/modules-load.d/zfs.conf.in
-@@ -1,3 +1,3 @@
- # The default behavior is to allow udev to load the kernel modules on demand.
- # Uncomment the following line to unconditionally load them at boot.
-#zfs
-+zfs
@@ -1,25 +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 12:04:35 +0100
-Subject: [PATCH] Fix the path to the zed binary on the systemd unit.
-
-We install zed into /usr/sbin manually meanwhile the upstream default is
-installing it into /sbin. Ubuntu packages also install zed to /usr/sbin, but
-they ship their own zfs-zed unit.
---
- etc/systemd/system/zfs-zed.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
-index f4313625e..444e776fd 100644
--- a/etc/systemd/system/zfs-zed.service.in
-+++ b/etc/systemd/system/zfs-zed.service.in
-@@ -3,7 +3,7 @@ Description=ZFS Event Daemon (zed)
- Documentation=man:zed(8)
- 
- [Service]
-ExecStart=@sbindir@/zed -F
-+ExecStart=/usr/sbin/zed -F
- Restart=on-abort
- 
- [Install]
@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Tue, 31 Oct 2017 19:12:42 +0800
-Subject: [PATCH] increase-default-zcmd-allocation-to-256K
-
-Increase default zcmd allocation to 256K (LP: #567557)
-
-When creating hundreds of clones (for example using containers with
-LXD) cloning slows down as the number of clones increases over time.
-The reason for this is that the fetching of the clone information
-using a small zcmd buffer requires two ioctl calls, one to determine
-the size and a second to return the data. However, this requires
-gathering the data twice, once to determine the size and again to
-populate the zcmd buffer to return it to userspace.
-
-These are expensive ioctl() calls, so instead, make the default buffer
-size much larger: 256K. This may sound large, but on 64 bit systems
-running ZFS this is not a huge chunk of memory for the speed
-improvement we gains for large sets of clones:
-
-        16K zcmd        256K zcmd
-Clones	Time    Clones  Time    Clone   % improvement
-        (secs) 	per sec (secs)  per sec
-100	7	14.29	5	20.00	28.57
-200	10	20.00	9	22.22	10.00
-300	19	15.79	18	16.67	5.26
-400	22	18.18	22	18.18	0.00
-500	29	17.24	29	17.24	0.00
-600	39	15.38	39	15.38	0.00
-700	46	15.22	45	15.56	2.17
-800	58	13.79	51	15.69	12.07
-900	74	12.16	61	14.75	17.57
-1000	90	11.11	74	13.51	17.78
-1100	98	11.22	87	12.64	11.22
-1200	102	11.76	95	12.63	6.86
-1300	113	11.50	104	12.50	7.96
-1400	143	9.79	109	12.84	23.78
-1500	145	10.34	132	11.36	8.97
-1600	165	9.70	145	11.03	12.12
-1700	187	9.09	156	10.90	16.58
-1800	210	8.57	166	10.84	20.95
-1900	226	8.41	183	10.38	19.03
-2000	256	7.81	198	10.10	22.66
-2200	311	7.07	238	9.24	23.47
-2400	373	6.43	271	8.86	27.35
-2600	487	5.34	316	8.23	35.11
-3000	619	4.85	426	7.04	31.18
-3400	915	3.72	549	6.19	40.00
-4000	1332	3.00	923	4.33	30.71
-
-As one can see, with > 2000 clones we get 25-40% speed
-improvement.
-
-This patch was originally suggested by Brian Behlendorf
-(see https://github.com/zfsonlinux/zfs/issues/6372), however
-this fix is a more generic fix to cover all zcmd cases.
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
- lib/libzfs/libzfs_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
-index 19bb57ad4..2a069ffe6 100644
--- a/lib/libzfs/libzfs_util.c
-+++ b/lib/libzfs/libzfs_util.c
-@@ -1134,7 +1134,7 @@ int
- zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len)
- {
- 	if (len == 0)
-		len = 16 * 1024;
-+		len = 256 * 1024;
- 	zc->zc_nvlist_dst_size = len;
- 	zc->zc_nvlist_dst =
- 	    (uint64_t)(uintptr_t)zfs_alloc(hdl, zc->zc_nvlist_dst_size);
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Richard Laager <rlaager@wiktel.com>
-Date: Wed, 30 Jan 2019 15:12:04 +0100
-Subject: [PATCH] Enable zed emails
-
-The OpenZFS event daemon monitors pools. This patch enables the email sending
-function by default (if zed is installed). This is consistent with the default
-behavior of mdadm.
---
- cmd/zed/zed.d/zed.rc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index 0ef706849..50632bfcb 100644
--- a/cmd/zed/zed.d/zed.rc
-+++ b/cmd/zed/zed.d/zed.rc
-@@ -15,7 +15,7 @@
- # Email will only be sent if ZED_EMAIL_ADDR is defined.
- # Disabled by default; uncomment to enable.
- #
-#ZED_EMAIL_ADDR="root"
-+ZED_EMAIL_ADDR="root"
- 
- ##
- # Name or path of executable responsible for sending notifications via email;
-@@ -41,7 +41,7 @@
- ##
- # Minimum number of seconds between notifications for a similar event.
- #
-#ZED_NOTIFY_INTERVAL_SECS=3600
-+ZED_NOTIFY_INTERVAL_SECS=3600
- 
- ##
- # Notification verbosity.
@@ -1,244 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
-Date: Wed, 10 Jul 2019 01:31:46 +0900
-Subject: [PATCH] Fix race in parallel mount's thread dispatching algorithm
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Strategy of parallel mount is as follows.
-
-1) Initial thread dispatching is to select sets of mount points that
- don't have dependencies on other sets, hence threads can/should run
- lock-less and shouldn't race with other threads for other sets. Each
- thread dispatched corresponds to top level directory which may or may
- not have datasets to be mounted on sub directories.
-
-2) Subsequent recursive thread dispatching for each thread from 1)
- is to mount datasets for each set of mount points. The mount points
- within each set have dependencies (i.e. child directories), so child
- directories are processed only after parent directory completes.
-
-The problem is that the initial thread dispatching in
-zfs_foreach_mountpoint() can be multi-threaded when it needs to be
-single-threaded, and this puts threads under race condition. This race
-appeared as mount/unmount issues on ZoL for ZoL having different
-timing regarding mount(2) execution due to fork(2)/exec(2) of mount(8).
-`zfs unmount -a` which expects proper mount order can't unmount if the
-mounts were reordered by the race condition.
-
-There are currently two known patterns of input list `handles` in
-`zfs_foreach_mountpoint(..,handles,..)` which cause the race condition.
-
-1) #8833 case where input is `/a /a /a/b` after sorting.
- The problem is that libzfs_path_contains() can't correctly handle an
- input list with two same top level directories.
- There is a race between two POSIX threads A and B,
-  * ThreadA for "/a" for test1 and "/a/b"
-  * ThreadB for "/a" for test0/a
- and in case of #8833, ThreadA won the race. Two threads were created
- because "/a" wasn't considered as `"/a" contains "/a"`.
-
-2) #8450 case where input is `/ /var/data /var/data/test` after sorting.
- The problem is that libzfs_path_contains() can't correctly handle an
- input list containing "/".
- There is a race between two POSIX threads A and B,
-  * ThreadA for "/" and "/var/data/test"
-  * ThreadB for "/var/data"
- and in case of #8450, ThreadA won the race. Two threads were created
- because "/var/data" wasn't considered as `"/" contains "/var/data"`.
- In other words, if there is (at least one) "/" in the input list,
- the initial thread dispatching must be single-threaded since every
- directory is a child of "/", meaning they all directly or indirectly
- depend on "/".
-
-In both cases, the first non_descendant_idx() call fails to correctly
-determine "path1-contains-path2", and as a result the initial thread
-dispatching creates another thread when it needs to be single-threaded.
-Fix a conditional in libzfs_path_contains() to consider above two.
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
-Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
-Closes #8450
-Closes #8833
-Closes #8878
-(cherry picked from commit ab5036df1ccbe1b18c1ce6160b5829e8039d94ce)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- .../functional/cli_root/zfs_mount/Makefile.am |   1 +
- lib/libzfs/libzfs_mount.c                     |   6 +-
- tests/runfiles/linux.run                      |   3 +-
- .../cli_root/zfs_mount/zfs_mount_test_race.sh | 116 ++++++++++++++++++
- 4 files changed, 123 insertions(+), 3 deletions(-)
- create mode 100755 tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh
-
-diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
-index b2de98934..c208a1c37 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
-+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
-@@ -19,6 +19,7 @@ dist_pkgdata_SCRIPTS = \
- 	zfs_mount_all_mountpoints.ksh \
- 	zfs_mount_encrypted.ksh \
- 	zfs_mount_remount.ksh \
-+	zfs_mount_test_race.sh \
- 	zfs_multi_mount.ksh
- 
- dist_pkgdata_DATA = \
-diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c
-index 649c232aa..d62801cfd 100644
--- a/lib/libzfs/libzfs_mount.c
-+++ b/lib/libzfs/libzfs_mount.c
-@@ -1302,12 +1302,14 @@ mountpoint_cmp(const void *arga, const void *argb)
- }
- 
- /*
- * Return true if path2 is a child of path1.
-+ * Return true if path2 is a child of path1 or path2 equals path1 or
-+ * path1 is "/" (path2 is always a child of "/").
-  */
- static boolean_t
- libzfs_path_contains(const char *path1, const char *path2)
- {
-	return (strstr(path2, path1) == path2 && path2[strlen(path1)] == '/');
-+	return (strcmp(path1, path2) == 0 || strcmp(path1, "/") == 0 ||
-+	    (strstr(path2, path1) == path2 && path2[strlen(path1)] == '/'));
- }
- 
- /*
-diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
-index 22fc26212..4d673cc95 100644
--- a/tests/runfiles/linux.run
-+++ b/tests/runfiles/linux.run
-@@ -182,7 +182,8 @@ tests = ['zfs_mount_001_pos', 'zfs_mount_002_pos', 'zfs_mount_003_pos',
-     'zfs_mount_007_pos', 'zfs_mount_008_pos', 'zfs_mount_009_neg',
-     'zfs_mount_010_neg', 'zfs_mount_011_neg', 'zfs_mount_012_neg',
-     'zfs_mount_all_001_pos', 'zfs_mount_encrypted', 'zfs_mount_remount',
-    'zfs_multi_mount', 'zfs_mount_all_fail', 'zfs_mount_all_mountpoints']
-+    'zfs_multi_mount', 'zfs_mount_all_fail', 'zfs_mount_all_mountpoints',
-+    'zfs_mount_test_race']
- tags = ['functional', 'cli_root', 'zfs_mount']
- 
- [tests/functional/cli_root/zfs_program]
-diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh
-new file mode 100755
-index 000000000..404770b27
--- /dev/null
-+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh
-@@ -0,0 +1,116 @@
-+#!/bin/ksh
-+
-+#
-+# This file and its contents are supplied under the terms of the
-+# Common Development and Distribution License ("CDDL"), version 1.0.
-+# You may only use this file in accordance with the terms of version
-+# 1.0 of the CDDL.
-+#
-+# A full copy of the text of the CDDL should have accompanied this
-+# source.  A copy of the CDDL is also available via the Internet at
-+# http://www.illumos.org/license/CDDL.
-+#
-+
-+#
-+# Copyright (c) 2019 by Tomohiro Kusumi. All rights reserved.
-+#
-+
-+. $STF_SUITE/include/libtest.shlib
-+. $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.cfg
-+
-+#
-+# DESCRIPTION:
-+# Verify parallel mount ordering is consistent.
-+#
-+# There was a bug in initial thread dispatching algorithm which put threads
-+# under race condition which resulted in undefined mount order.  The purpose
-+# of this test is to verify `zfs unmount -a` succeeds (not `zfs mount -a`
-+# succeeds, it always does) after `zfs mount -a`, which could fail if threads
-+# race.  See github.com/zfsonlinux/zfs/issues/{8450,8833,8878} for details.
-+#
-+# STRATEGY:
-+# 1. Create pools and filesystems.
-+# 2. Set same mount point for >1 datasets.
-+# 3. Unmount all datasets.
-+# 4. Mount all datasets.
-+# 5. Unmount all datasets (verify this succeeds).
-+#
-+
-+verify_runnable "both"
-+
-+TMPDIR=${TMPDIR:-$TEST_BASE_DIR}
-+MNTPT=$TMPDIR/zfs_mount_test_race_mntpt
-+DISK1="$TMPDIR/zfs_mount_test_race_disk1"
-+DISK2="$TMPDIR/zfs_mount_test_race_disk2"
-+
-+TESTPOOL1=zfs_mount_test_race_tp1
-+TESTPOOL2=zfs_mount_test_race_tp2
-+
-+export __ZFS_POOL_RESTRICT="$TESTPOOL1 $TESTPOOL2"
-+log_must zfs $unmountall
-+unset __ZFS_POOL_RESTRICT
-+
-+function cleanup
-+{
-+	zpool destroy $TESTPOOL1
-+	zpool destroy $TESTPOOL2
-+	rm -rf $MNTPT
-+	rm -rf /$TESTPOOL1
-+	rm -rf /$TESTPOOL2
-+	rm -f $DISK1
-+	rm -f $DISK2
-+	export __ZFS_POOL_RESTRICT="$TESTPOOL1 $TESTPOOL2"
-+	log_must zfs $mountall
-+	unset __ZFS_POOL_RESTRICT
-+}
-+log_onexit cleanup
-+
-+log_note "Verify parallel mount ordering is consistent"
-+
-+log_must truncate -s $MINVDEVSIZE $DISK1
-+log_must truncate -s $MINVDEVSIZE $DISK2
-+
-+log_must zpool create -f $TESTPOOL1 $DISK1
-+log_must zpool create -f $TESTPOOL2 $DISK2
-+
-+log_must zfs create $TESTPOOL1/$TESTFS1
-+log_must zfs create $TESTPOOL2/$TESTFS2
-+
-+log_must zfs set mountpoint=none $TESTPOOL1
-+log_must zfs set mountpoint=$MNTPT $TESTPOOL1/$TESTFS1
-+
-+# Note that unmount can fail (due to race condition on `zfs mount -a`) with or
-+# without `canmount=off`.  The race has nothing to do with canmount property,
-+# but turn it off for convenience of mount layout used in this test case.
-+log_must zfs set canmount=off $TESTPOOL2
-+log_must zfs set mountpoint=$MNTPT $TESTPOOL2
-+
-+# At this point, layout of datasets in two pools will look like below.
-+# Previously, on next `zfs mount -a`, pthreads assigned to TESTFS1 and TESTFS2
-+# could race, and TESTFS2 usually (actually always) won in ZoL.  Note that the
-+# problem is how two or more threads could initially be assigned to the same
-+# top level directory, not this specific layout.  This layout is just an example
-+# that can reproduce race, and is also the layout reported in #8833.
-+#
-+# NAME                  MOUNTED  MOUNTPOINT
-+# ----------------------------------------------
-+# /$TESTPOOL1           no       none
-+# /$TESTPOOL1/$TESTFS1  yes      $MNTPT
-+# /$TESTPOOL2           no       $MNTPT
-+# /$TESTPOOL2/$TESTFS2  yes      $MNTPT/$TESTFS2
-+
-+# Apparently two datasets must be mounted.
-+log_must ismounted $TESTPOOL1/$TESTFS1
-+log_must ismounted $TESTPOOL2/$TESTFS2
-+# This unmount always succeeds, because potential race hasn't happened yet.
-+log_must zfs unmount -a
-+# This mount always succeeds, whether threads are under race condition or not.
-+log_must zfs mount -a
-+
-+# Verify datasets are mounted (TESTFS2 fails if the race broke mount order).
-+log_must ismounted $TESTPOOL1/$TESTFS1
-+log_must ismounted $TESTPOOL2/$TESTFS2
-+# Verify unmount succeeds (fails if the race broke mount order).
-+log_must zfs unmount -a
-+
-+log_pass "Verify parallel mount ordering is consistent passed"
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 17 Jul 2019 09:14:36 -0700
-Subject: [PATCH] Fix CONFIG_X86_DEBUG_FPU build failure
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When CONFIG_X86_DEBUG_FPU is defined the alternatives_patched symbol
-is pulled in as a dependency which results in a build failure.  To
-prevent this undefine CONFIG_X86_DEBUG_FPU to disable the WARN_ON_FPU()
-macro and rely on WARN_ON_ONCE debugging checks which were previously
-added.
-
-Reviewed-by: Tony Hutter <hutter2@llnl.gov>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #9041
-Closes #9049
-(cherry picked from commit 095b5412b31c07cad5cec74a4eb5ace011c92b27)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- include/linux/simd_x86.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
-index 2d7a1c3a5..5f243e0cc 100644
--- a/include/linux/simd_x86.h
-+++ b/include/linux/simd_x86.h
-@@ -82,6 +82,15 @@
- 
- #if defined(_KERNEL)
- 
-+/*
-+ * Disable the WARN_ON_FPU() macro to prevent additional dependencies
-+ * when providing the kfpu_* functions.  Relevant warnings are included
-+ * as appropriate and are unconditionally enabled.
-+ */
-+#if defined(CONFIG_X86_DEBUG_FPU) && !defined(KERNEL_EXPORTS_X86_FPU)
-+#undef CONFIG_X86_DEBUG_FPU
-+#endif
-+
- #if defined(HAVE_KERNEL_FPU_API_HEADER)
- #include <asm/fpu/api.h>
- #include <asm/fpu/internal.h>
@@ -1,9 +0,0 @@
-0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
-0002-always-load-ZFS-module-on-boot.patch
-0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
-0004-increase-default-zcmd-allocation-to-256K.patch
-0005-import-with-d-dev-disk-by-id-in-scan-service.patch
-0006-Enable-zed-emails.patch
-0007-Fix-race-in-parallel-mount-s-thread-dispatching-algo.patch
-0008-Linux-5.0-compat-SIMD-compatibility.patch
-0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch
@@ -1 +0,0 @@
-usr/lib/python3*
@@ -1,109 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/dpkg/default.mk
-
-VERSION := $(DEB_VERSION_UPSTREAM)
-REVISION := $(shell echo $(DEB_VERSION) | cut -d- -f2)
-
-SPHINX_BUILD = $(shell dpkg -L python3-sphinx | grep "sphinx-build$$")
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-%:
-	dh $@ --with autoreconf,python3,systemd,sphinxdoc --parallel
-
-adapt_meta_file:
-	@# Embed the downstream version in the module.
-	@sed \
-	  -e 's/^Version:.*/Version:      $(VERSION)/' \
-	  -e 's/^Release:.*/Release:      $(REVISION)/' \
-	  -i.orig META
-
-
-override_dh_autoreconf: adapt_meta_file
-	dh_autoreconf
-
-override_dh_auto_configure:
-	@# Build the userland, but don't build the kernel modules.
-	dh_auto_configure -- \
-	  --bindir=/usr/bin \
-	  --sbindir=/sbin \
-	  --libdir=/lib \
-	  --with-udevdir=/lib/udev \
-	  --with-zfsexecdir=/usr/lib/zfs-linux \
-	  --enable-systemd \
-	  --enable-pyzfs \
-	  --with-systemdunitdir=/lib/systemd/system \
-	  --with-systemdpresetdir=/lib/systemd/system-preset \
-	  --with-systemdgeneratordir=/lib/systemd/system-generators \
-	  --with-config=user
-
-override_dh_auto_test:
-	# The dh_auto_test rule is disabled because
-	# `make check` cannot run in an unprivileged build environment.
-
-override_dh_auto_install:
-	@# Install the utilities.
-	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
-
-	# Use upstream's bash completion
-	install -D -t '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/' \
-		'$(CURDIR)/contrib/bash_completion.d/zfs'
-
-	# Move from bin_dir to /usr/sbin
-	# Remove suffix (.py) as per policy 10.4 - Scripts
-	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
-	mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
-	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
-	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
-	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
-
-	@# Zed has dependencies outside of the system root.
-	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
-
-	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}`; \
-		rm $${i}; \
-	done
-
-	chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
-	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
-	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
-
-override_dh_python3:
-	dh_python3 -p python3-pyzfs
-
-override_dh_makeshlibs:
-	dh_makeshlibs -a -V
-ifeq ($(BUILD_UDEB), true)
-	dh_makeshlibs -V -plibnvpair1linux
-	dh_makeshlibs -V -plibuutil1linux
-	dh_makeshlibs -V -plibzfs2linux
-	dh_makeshlibs -V -plibzpool2linux
-	dh_makeshlibs -V -pzfsutils-linux
-endif
-
-override_dh_strip:
-	dh_strip --dbg-package=zfs-dbg
-
-override_dh_auto_clean:
-	find . -name .gitignore -delete
-	rm -rf zfs-$(DEB_VERSION_UPSTREAM)
-	dh_auto_clean
-	@if test -e META.orig; then mv META.orig META; fi
-
-override_dh_install:
-	find . -name lib*.la -delete
-	dh_install --fail-missing
-
-override_dh_installdocs:
-	dh_installdocs
-ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
-	http_proxy='127.0.0.1:9' $(SPHINX_BUILD) -N -bhtml "$(CURDIR)/contrib/pyzfs/docs/source/" debian/pyzfs-doc/usr/share/doc/pyzfs-doc/html/
-endif
-
-# ------------
-
-debian-copyright:
-	cme update dpkg-copyright -file debian/copyright.cme
@@ -1 +0,0 @@
-3.0 (quilt)
@@ -1,8 +0,0 @@
-for x in $(cat /proc/cmdline)
-do
-	case $x in
-		root=ZFS=*)
-			BOOT=zfs
-			;;
-	esac
-done
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-# Add udev rules for ZoL to the initrd.
-#
-
-PREREQ="udev"
-PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules"
-COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id"
-
-# Generic result code.
-RC=0
-
-case $1 in
-prereqs)
-	echo "$PREREQ"
-	exit 0
-	;;
-esac
-
-for ii in $COPY_EXEC_LIST
-do
-	if [ ! -x "$ii" ]
-	then
-		echo "Error: $ii is not executable."
-		RC=2
-	fi
-done
-
-if [ "$RC" -ne 0 ]
-then
-	exit "$RC"
-fi
-
-. /usr/share/initramfs-tools/hook-functions
-
-mkdir -p "$DESTDIR/lib/udev/rules.d/"
-for ii in $PREREQ_UDEV_RULES
-do
-	if [ -e "/etc/udev/rules.d/$ii" ]
-	then
-		cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
-	elif [ -e "/lib/udev/rules.d/$ii" ]
-	then
-		cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
-	else
-		echo "Error: Missing udev rule: $ii"
-		echo "       This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory."
-		exit 1
-	fi
-done
-
-for ii in $COPY_EXEC_LIST
-do
-	copy_exec "$ii"
-done
-
-if [ -f '/etc/default/zfs' -a -r '/etc/default/zfs' ]
-then
-	mkdir -p "$DESTDIR/etc/default"
-	cp -a '/etc/default/zfs' "$DESTDIR/etc/default/"
-fi
-
-if [ -d '/etc/zfs' -a -r '/etc/zfs' ]
-then
-	mkdir -p "$DESTDIR/etc"
-	cp -a '/etc/zfs' "$DESTDIR/etc/"
-fi
@@ -1,18 +0,0 @@
-## Allow read-only ZoL commands to be called through sudo
-## without a password. Remove the first '#' column to enable.
-##
-## CAUTION: Any syntax error introduced here will break sudo.
-##
-## Cmnd alias specification
-#Cmnd_Alias C_ZFS = \
-#  /sbin/zfs "", /sbin/zfs help *, \
-#  /sbin/zfs get, /sbin/zfs get *, \
-#  /sbin/zfs list, /sbin/zfs list *, \
-#  /sbin/zpool "", /sbin/zpool help *, \
-#  /sbin/zpool iostat, /sbin/zpool iostat *, \
-#  /sbin/zpool list, /sbin/zpool list *, \
-#  /sbin/zpool status, /sbin/zpool status *, \
-#  /sbin/zpool upgrade, /sbin/zpool upgrade -v
-#
-## allow any user to use basic read-only ZFS commands
-#ALL ALL = (root) NOPASSWD: C_ZFS
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Sub-test to exclude ZVOLs
-set -e
-partition="$1"
-
-. /usr/share/os-prober/common.sh
-
-if [ "$(stat -L -c %t "$partition")" = "e6" ] ; then
-	debug "$1 is a ZVOL; skipping"
-	exit 0
-fi
-
-# No ZVOLs found
-exit 1
@@ -1,9 +0,0 @@
-#!/bin/sh -eu
-
-# Scrub all healthy pools.
-zpool list -H -o health,name 2>&1 | \
-	awk 'BEGIN {FS="\t"} {if ($1 ~ /^ONLINE/) print $2}' | \
-while read pool
-do
-	zpool scrub "$pool"
-done
@@ -1,2 +0,0 @@
-version=3
-https://zfsonlinux.org/ .*zfs-([\d\.]+)\.tar\.gz$
@@ -1,2 +0,0 @@
-../tree/zfs-initramfs/* /
-usr/share/initramfs-tools/*
@@ -1 +0,0 @@
-activate update-initramfs
@@ -1,15 +0,0 @@
-sbin/zinject
-sbin/ztest
-usr/bin/raidz_test
-usr/share/man/man1/raidz_test.1
-usr/share/man/man1/test-runner.1
-usr/share/man/man1/ztest.1
-usr/share/man/man8/zinject.8
-usr/share/zfs/common.sh
-usr/share/zfs/runfiles/
-usr/share/zfs/test-runner
-usr/share/zfs/zfs-tests.sh
-usr/share/zfs/zfs-tests/
-usr/share/zfs/zfs.sh
-usr/share/zfs/zimport.sh
-usr/share/zfs/zloop.sh
@@ -1 +0,0 @@
-zfs-test: arch-dependent-file-in-usr-share
@@ -1,5 +0,0 @@
-etc/zfs/zed.d/*
-lib/systemd/system/zfs-zed.service
-usr/lib/zfs-linux/zed.d/*
-usr/sbin/zed
-usr/share/man/man8/zed.8
@@ -1,4 +0,0 @@
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-# Scrub the second Sunday of every month.
-24 0 8-14 * * root [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ] && /usr/lib/zfs-linux/scrub
@@ -1,2 +0,0 @@
-COPYRIGHT
-LICENSE
@@ -1,5 +0,0 @@
-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
-etc/zfs/vdev_id.conf.scsi.example
@@ -1,39 +0,0 @@
-../tree/zfsutils-linux/* /
-etc/default/zfs
-etc/zfs/zfs-functions
-etc/zfs/zpool.d/
-lib/systemd/system-preset/
-lib/systemd/system/zfs-import-cache.service
-lib/systemd/system/zfs-import-scan.service
-lib/systemd/system/zfs-import.target
-lib/systemd/system/zfs-mount.service
-lib/systemd/system/zfs-share.service
-lib/systemd/system/zfs.target
-lib/systemd/system-generators/zfs-mount-generator
-lib/udev/
-sbin/fsck.zfs
-sbin/mount.zfs
-sbin/zdb
-sbin/zfs
-sbin/zhack
-sbin/zpool
-sbin/zstreamdump
-usr/bin/zgenhostid
-usr/lib/modules-load.d/ lib/
-usr/lib/zfs-linux/zpool.d/
-usr/sbin/arc_summary
-usr/sbin/arcstat
-usr/sbin/dbufstat
-usr/share/bash-completion/completions
-usr/share/man/man1/zhack.1
-usr/share/man/man5/
-usr/share/man/man8/fsck.zfs.8
-usr/share/man/man8/mount.zfs.8
-usr/share/man/man8/vdev_id.8
-usr/share/man/man8/zdb.8
-usr/share/man/man8/zfs.8
-usr/share/man/man8/zfs-mount-generator.8
-usr/share/man/man8/zfs-program.8
-usr/share/man/man8/zgenhostid.8
-usr/share/man/man8/zpool.8
-usr/share/man/man8/zstreamdump.8
@@ -1 +0,0 @@
-systemd-service-file-refers-to-unusual-wantedby-target
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-# The hostname and hostid of the last system to access a ZFS pool are stored in
-# the ZFS pool itself. A pool is foreign if, during `zpool import`, the
-# current hostname and hostid are different than the stored values thereof.
-#
-# The only way of having a stable hostid is to define it in /etc/hostid.
-# This postinst helper will check if we already have the hostid stabilized by
-# checking the existence of the file /etc/hostid to be 4 bytes at least.
-# If this file don't already exists on our system or has less than 4 bytes, then
-# a new (random) value is generated with zgenhostid (8) and stored in
-# /etc/hostid
-
-if [ ! -f /etc/hostid ] || [ "$(stat -c %s /etc/hostid)" -lt 4 ] ; then
-	zgenhostid
-fi
-
-#DEBHELPER#
-
@@ -0,0 +1,82 @@
+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
+
+spl-linux (0.6.5-pve3~jessie) unstable; urgency=medium
+
+  * update to 0.6.5.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 11:00:40 +0100
+
+spl-linux (0.6.5-pve2~jessie) unstable; urgency=medium
+
+  * update to 0.6.5.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:40:58 +0100
+
+spl-linux (0.6.5-pve1~jessie) unstable; urgency=medium
+
+  * update to master/debian/jessie/0.6.5-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:04:23 +0200
+
+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)
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:02:31 +0200
+
+spl-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:17:26 +0200
+
+spl-linux (0.6.3-pve1~jessie) unstable; urgency=medium
+
+  * 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
+
@@ -0,0 +1,150 @@
+From b750abda7a2b24c52a4fba505571a629223ad64e 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.in | 24 --------------------
+ debian/rules      | 68 +------------------------------------------------------
+ 2 files changed, 1 insertion(+), 91 deletions(-)
+
+diff --git a/debian/control.in b/debian/control.in
+index 52c1660..dc6ee96 100644
+--- a/debian/control.in
+++ b/debian/control.in
+@@ -8,40 +8,16 @@ Build-Depends: autogen,
+                autotools-dev,
+                debhelper (>= 9),
+                dh-autoreconf,
+-               dkms (>> 2.2.0.2-1~),
+                libtool
+ Standards-Version: 3.9.8
+ Homepage: http://www.zfsonlinux.org/
+ Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/spl.git
+ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
+ 
+-Package: spl-dkms
+-Architecture: all
+-Depends: dkms (>> 2.2.1.0), file, libc-dev, lsb-release, ${misc:Depends}
+-Recommends: spl (>= ${source:Upstream-Version})
+-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 b2fc86c..a474ca4 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:
+ 	@cp 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
+ 	cp 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.1.4
+
@@ -0,0 +1 @@
+fix-control.patch
@@ -0,0 +1,151 @@
+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
+
+  * use /sbin/modprobe to avoid warning inside initrd
+
+  * fix warning about undefined values inside initrd
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
+
+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
+
@@ -0,0 +1,174 @@
+From b8f3b081a866fc3d529fb2e72c425ef54c4d141d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 11 Jan 2017 09:16:11 +0100
+Subject: [PATCH 1/6] Undo python changes until PVE 5.0 release
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Revert "Remove .py extension from utilities in /usr/sbin as per policy 10.4 Scripts  (LP: #1628279)"
+
+This reverts commit e1c956cc55451476c465aad351c4b9c92294fc36.
+
+Revert "Use python3 for arcstat.py, arc_summary.py & dbufstat.py (LP: #1627909)"
+
+This reverts commit a52a9356809b8a09b97957a238a36da82ce9f850.
+
+Revert "Add missing part in python3 move"
+
+This reverts commit 9173586640d4a9f64f87a70bb9f93e41c78009fc.
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ debian/control.in                              |  4 ++--
+ debian/patches/1001-cmd-python-exec-path.patch | 30 --------------------------
+ debian/control                                 |  4 ++--
+ debian/patches/series                          |  1 -
+ debian/rules                                   | 11 ++++------
+ debian/zfsutils-linux.install                  |  6 +++---
+ 6 files changed, 11 insertions(+), 45 deletions(-)
+ delete mode 100644 debian/patches/1001-cmd-python-exec-path.patch
+
+diff --git a/debian/control.in b/debian/control.in
+index 76907e4..db75496 100644
+--- a/debian/control.in
+++ b/debian/control.in
+@@ -16,7 +16,7 @@ Build-Depends: dh-autoreconf,
+                po-debconf,
+                uuid-dev,
+                zlib1g-dev,
+-               python3,
+               python,
+                dh-python,
+                libblkid-dev,
+                libattr1-dev
+@@ -127,7 +127,7 @@ Description: OpenZFS root filesystem capabilities for Linux - dracut
+ Package: zfsutils-linux
+ Section: contrib/admin
+ Architecture: linux-any
+-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+ Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
+ Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
+ Conflicts: zfs, zfs-fuse, zutils
+diff --git a/debian/patches/1001-cmd-python-exec-path.patch b/debian/patches/1001-cmd-python-exec-path.patch
+deleted file mode 100644
+index a05afb4..0000000
+--- a/debian/patches/1001-cmd-python-exec-path.patch
+++ /dev/null
+@@ -1,30 +0,0 @@
+-Index: zfs-linux-0.6.5.8/cmd/arc_summary/arc_summary.py
+-===================================================================
+---- zfs-linux-0.6.5.8.orig/cmd/arc_summary/arc_summary.py
+-+++ zfs-linux-0.6.5.8/cmd/arc_summary/arc_summary.py
+-@@ -1,4 +1,4 @@
+--#!/usr/bin/python
+-+#!/usr/bin/python3
+- #
+- # $Id: arc_summary.pl,v 388:e27800740aa2 2011-07-08 02:53:29Z jhell $
+- #
+-Index: zfs-linux-0.6.5.8/cmd/arcstat/arcstat.py
+-===================================================================
+---- zfs-linux-0.6.5.8.orig/cmd/arcstat/arcstat.py
+-+++ zfs-linux-0.6.5.8/cmd/arcstat/arcstat.py
+-@@ -1,4 +1,4 @@
+--#!/usr/bin/python
+-+#!/usr/bin/python3
+- #
+- # Print out ZFS ARC Statistics exported via kstat(1)
+- # For a definition of fields, or usage, use arctstat.pl -v
+-Index: zfs-linux-0.6.5.8/cmd/dbufstat/dbufstat.py
+-===================================================================
+---- zfs-linux-0.6.5.8.orig/cmd/dbufstat/dbufstat.py
+-+++ zfs-linux-0.6.5.8/cmd/dbufstat/dbufstat.py
+-@@ -1,4 +1,4 @@
+--#!/usr/bin/python
+-+#!/usr/bin/python3
+- #
+- # Print out statistics for all cached dmu buffers.  This information
+- # is available through the dbufs kstat and may be post-processed as
+diff --git a/debian/control b/debian/control
+index 76907e4..db75496 100644
+--- a/debian/control
+++ b/debian/control
+@@ -16,7 +16,7 @@ Build-Depends: dh-autoreconf,
+                po-debconf,
+                uuid-dev,
+                zlib1g-dev,
+-               python3,
+               python,
+                dh-python,
+                libblkid-dev,
+                libattr1-dev
+@@ -127,7 +127,7 @@ Description: OpenZFS root filesystem capabilities for Linux - dracut
+ Package: zfsutils-linux
+ Section: contrib/admin
+ Architecture: linux-any
+-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+ Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
+ Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
+ Conflicts: zfs, zfs-fuse, zutils
+diff --git a/debian/patches/series b/debian/patches/series
+index df85d5b..0fed690 100644
+--- a/debian/patches/series
+++ b/debian/patches/series
+@@ -4,7 +4,6 @@
+ 1000-ppc64el-endian-support.patch
+ 1002-fix-mips-build.patch
+ enable-zed.patch
+-1001-cmd-python-exec-path.patch
+ 1004-zed-service-bindir.patch
+ 1002-Fix-dev-zfs-device-is-missing.patch
+ 0001-fix-booting-via-dracut-generated-initramfs.patch
+diff --git a/debian/rules b/debian/rules
+index 9efbace..70e57e5 100755
+--- a/debian/rules
+++ b/debian/rules
+@@ -35,7 +35,7 @@ pmodules = $(PACKAGE)-modules-$(non_epoch_version)
+ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+ 
+ %:
+-	dh $@ --with autoreconf,dkms,python3,systemd --parallel
+	dh $@ --with autoreconf,dkms,python2,systemd --parallel
+ 
+ override_dh_auto_configure:
+ 	@cp debian/control.in debian/control
+@@ -64,14 +64,11 @@ override_dh_auto_install:
+ 	@# Install the utilities.
+ 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
+ 
+- 
+ 	# Move from bin_dir to /usr/sbin
+-	# Remove suffix (.py) as per policy 10.4 - Scripts
+-	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
+ 	mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
+-	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary.py' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
+-	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat.py' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
+-	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
+	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary.py' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary.py'
+	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat.py' '$(CURDIR)/debian/tmp/usr/sbin/arcstat.py'
+	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat.py'
+ 
+ 	@# Zed has dependencies outside of the system root.
+ 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
+diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
+index 947ffd9..4badbf1 100644
+--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
+@@ -19,9 +19,9 @@ sbin/zdb
+ sbin/zpios
+ sbin/zpool
+ sbin/zfs
+-usr/sbin/arc_summary
+-usr/sbin/arcstat
+-usr/sbin/dbufstat
+usr/sbin/arc_summary.py
+usr/sbin/arcstat.py
+usr/sbin/dbufstat.py
+ usr/share/zfs/
+ usr/share/man/man1/
+ usr/share/man/man5/
+-- 
+2.1.4
+
@@ -0,0 +1,242 @@
+From 0e7871b8878f78fd2c8c73a50cbf805b39afb4e7 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 2/6] 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.in |  34 +++---------------
+ debian/rules      | 105 ++----------------------------------------------------
+ 2 files changed, 6 insertions(+), 133 deletions(-)
+
+diff --git a/debian/control.in b/debian/control.in
+index db75496..22dd958 100644
+--- a/debian/control.in
+++ b/debian/control.in
+@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
+                dh-systemd,
+                autotools-dev,
+                debhelper (>= 9),
+-               dkms (>> 2.1.1.2-5),
+                libselinux1-dev,
+                libtool,
+                lsb-release,
+@@ -85,25 +84,11 @@ 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})
+-Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
+-Recommends: zfsutils-linux, zfs-zed
+-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: initramfs-tools,
+  busybox-initramfs | busybox-static | busybox,
+- zfs-modules | zfs-dkms, zfsutils-linux,
+ zfsutils-linux,
+  ${misc:Depends}
+ Description: OpenZFS root filesystem capabilities for Linux - initramfs
+  The Z file system is a pooled filesystem designed for maximum data
+@@ -113,23 +98,12 @@ 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, ${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: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+-Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
+-Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
+Recommends: lsb-base, zfs-zed
+Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
+ Conflicts: zfs, zfs-fuse, zutils
+ Provides: zfsutils
+ Description: command-line tools to manage OpenZFS filesystems
+@@ -143,7 +117,7 @@ Description: command-line tools to manage OpenZFS filesystems
+ Package: zfs-zed
+ Section: contrib/admin
+ Architecture: linux-any
+-Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux
+Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
+ Description: OpenZFS Event Daemon
+  The Z file system is a pooled filesystem designed for maximum data
+  integrity, supporting data snapshots, multiple copies, and data
+diff --git a/debian/rules b/debian/rules
+index 70e57e5..0c8a6a2 100755
+--- a/debian/rules
+++ b/debian/rules
+@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
+ VERSION := $(shell dpkg-parsechangelog \
+   | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
+ 
+-DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
+-		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
+-
+ ifndef BUILD_UDEB
+ BUILD_UDEB=false
+ endif
+@@ -21,21 +18,16 @@ KVERS=$(shell uname -r)
+ endif
+ 
+ ifndef SPL
+-SPL=/usr/src/spl-$(VERSION)
+-endif
+-
+-ifndef SPLOBJ
+-SPLOBJ=/var/lib/dkms/spl/$(VERSION)/$(KVERS)/$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU)
+SPL=../pkg-spl
+ 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,python2,systemd --parallel
+	dh $@ --with autoreconf,python2,systemd --parallel
+ 
+ override_dh_auto_configure:
+ 	@cp debian/control.in debian/control
+@@ -74,36 +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)-$(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)'
+-	$(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.
+-	printf '#!/bin/sh\ncp "$$@"\n' > '$(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}`; \
+@@ -113,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 $(VERSION)
+-
+ override_dh_makeshlibs:
+ 	dh_makeshlibs -a
+ ifeq ($(BUILD_UDEB), true)
+@@ -153,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.1.4
+
@@ -0,0 +1,68 @@
+From 7e46d0f379706d74d5dc05ff20e58e708a1005a6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 12 Oct 2016 11:32:17 +0200
+Subject: [PATCH 3/6] add zfsutils.preinst/postinst for wheezy upgrade path
+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/zfsutils-linux.postinst | 20 ++++++++++++++++++++
+ debian/zfsutils-linux.preinst  | 17 +++++++++++++++++
+ 2 files changed, 37 insertions(+)
+ create mode 100755 debian/zfsutils-linux.postinst
+ create mode 100755 debian/zfsutils-linux.preinst
+
+diff --git a/debian/zfsutils-linux.postinst b/debian/zfsutils-linux.postinst
+new file mode 100755
+index 0000000..7d57919
+--- /dev/null
+++ b/debian/zfsutils-linux.postinst
+@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
+then
+	dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
+fi
+
+#DEBHELPER#
+
+diff --git a/debian/zfsutils-linux.preinst b/debian/zfsutils-linux.preinst
+new file mode 100755
+index 0000000..9338a7c
+--- /dev/null
+++ b/debian/zfsutils-linux.preinst
+@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
+then
+	dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
+fi
+
+#DEBHELPER#
+
+-- 
+2.1.4
+
@@ -0,0 +1,141 @@
+From 97a0ced45e12cd4cca627392f2d9eea6963ee00e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 12 Oct 2016 13:16:03 +0200
+Subject: [PATCH 4/6] ensure upgrade path from existing PVE ZFS packages
+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.in | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 58 insertions(+), 1 deletion(-)
+
+diff --git a/debian/control.in b/debian/control.in
+index 22dd958..2bee2bf 100644
+--- a/debian/control.in
+++ b/debian/control.in
+@@ -28,6 +28,8 @@ Package: libnvpair1linux
+ Section: contrib/libs
+ Architecture: linux-any
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libnvpair1 (<< 0.6.5.8-pve11~bpo80)
+Breaks: libnvpair1 (<< 0.6.5.8-pve11~bpo80)
+ Description: Solaris name-value library for Linux
+  This library provides routines for packing and unpacking nv pairs for
+  transporting data across process boundaries, transporting between
+@@ -37,6 +39,8 @@ Package: libuutil1linux
+ Section: contrib/libs
+ Architecture: linux-any
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libuutil1 (<< 0.6.5.8-pve11~bpo80)
+Breaks: libuutil1 (<< 0.6.5.8-pve11~bpo80)
+ Description: Solaris userland utility library for Linux
+  This library provides a variety of glue functions for ZFS on Linux:
+   * libspl: The Solaris Porting Layer userland library, which provides APIs
+@@ -54,6 +58,8 @@ Architecture: linux-any
+ Depends: libzfs2linux (= ${binary:Version}), libzpool2linux (= ${binary:Version}),
+  libnvpair1linux (= ${binary:Version}), libuutil1linux (= ${binary:Version}),
+  ${misc:Depends}
+Replaces: libzfs-dev (<< 0.6.5.8-pve11~bpo80)
+Breaks: libzfs-dev (<< 0.6.5.8-pve11~bpo80)
+ Provides: libnvpair-dev, libuutil-dev
+ Description: OpenZFS filesystem development files for Linux
+  Header files and static libraries for compiling software against
+@@ -66,6 +72,8 @@ Package: libzfs2linux
+ Section: contrib/libs
+ Architecture: linux-any
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libzfs2 (<< 0.6.5.8-pve11~bpo80)
+Breaks: libzfs2 (<< 0.6.5.8-pve11~bpo80)
+ Description: OpenZFS filesystem library for Linux
+  The Z file system is a pooled filesystem designed for maximum data
+  integrity, supporting data snapshots, multiple copies, and data
+@@ -77,6 +85,8 @@ Package: libzpool2linux
+ Section: contrib/libs
+ Architecture: linux-any
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libzpool2 (<< 0.6.5.8-pve11~bpo80)
+Breaks: libzpool2 (<< 0.6.5.8-pve11~bpo80)
+ Description: OpenZFS pool library for Linux
+  The Z file system is a pooled filesystem designed for maximum data
+  integrity, supporting data snapshots, multiple copies, and data
+@@ -88,8 +98,10 @@ Package: zfs-initramfs
+ Architecture: all
+ Depends: initramfs-tools,
+  busybox-initramfs | busybox-static | busybox,
+- zfsutils-linux,
+ zfsutils-linux (>= 0.6.5.8-pve11~bpo80),
+  ${misc:Depends}
+Breaks: zfs-initramfs (<< 0.6.5.8-pve11~bpo80)
+Replaces: zfs-initramfs (<< 0.6.5.8-pve11~bpo80)
+ Description: OpenZFS root filesystem capabilities for Linux - initramfs
+  The Z file system is a pooled filesystem designed for maximum data
+  integrity, supporting data snapshots, multiple copies, and data
+@@ -104,7 +116,9 @@ Architecture: linux-any
+ Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+ Recommends: lsb-base, zfs-zed
+ Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
+Replaces: zfsutils (<< 0.6.5.8-pve11~bpo80)
+ Conflicts: zfs, zfs-fuse, zutils
+Breaks: zfsutils (<< 0.6.5.8-pve11~bpo80)
+ Provides: zfsutils
+ Description: command-line tools to manage OpenZFS filesystems
+  The Z file system is a pooled filesystem designed for maximum data
+@@ -118,6 +132,7 @@ Package: zfs-zed
+ Section: contrib/admin
+ Architecture: linux-any
+ Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
+Replaces: zfsutils (<< 0.6.5.8-pve11~bpo80)
+ Description: OpenZFS Event Daemon
+  The Z file system is a pooled filesystem designed for maximum data
+  integrity, supporting data snapshots, multiple copies, and data
+@@ -142,3 +157,45 @@ Description: Debugging symbols for OpenZFS userland libraries and tools
+  .
+  This package contains the debugging symbols for libzpool2linux, libzfs2linux,
+  libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
+
+# Transitional packages
+
+Package: libzfs2
+Depends: libzfs2linux, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
+Package: libzpool2
+Depends: libzpool2linux, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
+Package: libnvpair1
+Depends: libnvpair1linux, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
+Package: libuutil1
+Depends: libuutil1linux, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
+Package: zfsutils
+Depends: zfsutils-linux, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+-- 
+2.1.4
+
@@ -1,27 +1,29 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 9a97a884f8a409395e00891afdc28fa92b9f79b3 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
+Subject: [PATCH 5/6] 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>
-Signed-off-by: Stoiko Ivanov <s.ivanov@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 4aae9f06e..ec5c45e63 100644
+index 0105283..665b9c8 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -11,7 +11,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
- [Service]
+@@ -10,7 +10,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
+ WantedBy=zfs-mount.service
+-- 
+2.1.4
+
@@ -0,0 +1,29 @@
+From 4264f648987efc980002ede5add258a427ad9a05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Thu, 27 Oct 2016 10:18:55 +0200
+Subject: [PATCH 6/6] fix rm path in zfs-share.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-share.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in
+index 688731e..494f5cb 100644
+--- a/etc/systemd/system/zfs-share.service.in
+++ b/etc/systemd/system/zfs-share.service.in
+@@ -9,7 +9,7 @@ PartOf=smb.service
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStartPre=-@bindir@/rm -f /etc/dfs/sharetab
+ExecStartPre=-/bin/rm -f /etc/dfs/sharetab
+ ExecStart=@sbindir@/zfs share -a
+ 
+ [Install]
+-- 
+2.1.4
+
@@ -0,0 +1,6 @@
+0001-Undo-python-changes-until-PVE-5.0-release.patch
+0002-remove-DKMS-modules-and-dracut-build.patch
+0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch
+0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch
+0005-import-with-d-dev-disk-by-id-in-scan-service.patch
+0006-fix-rm-path-in-zfs-share.service.patch
				`@@ -1 +0,0 @@`
				`libnvpair1linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`libuutil1linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`libzfs2linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`libzpool2linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`systemd-service-file-refers-to-unusual-wantedby-target`