bump version, update changelog

fix make upload target
add make deb target
2016-06-28 15:41:47 +02:00 · 2016-06-28 15:27:06 +02:00 · 2016-06-28 14:35:56 +02:00 · 2016-06-28 14:35:35 +02:00 · 2016-06-28 14:35:23 +02:00 · 2016-06-28 14:35:12 +02:00
21 changed files with 393 additions and 1041 deletions
@@ -1,6 +0,0 @@
-[submodule "zfs-debian"]
-	path = zfs-debian
-	url = ../mirror_zfs-debian
-[submodule "spl-debian"]
-	path = spl-debian
-	url = ../mirror_spl-debian
@@ -1,74 +1,79 @@
-RELEASE=5.1
+RELEASE=3.4

 # source form https://github.com/zfsonlinux/

-ZFSVER=0.7.4
-ZFSPKGREL=pve1~bpo9
-SPLPKGREL=pve1~bpo9
+# also update version in 
+# zfs-changelog.Debian and spl-changelog.Debian
+ZFSVER=0.6.5.7
+ZFSPKGREL=5~bpo70
+SPLPKGREL=5~bpo70
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}

-SPLDIR=spl-build
-SPLSRC=spl-debian
-ZFSDIR=zfs-build
-ZFSSRC=zfs-debian
+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		\
-libzpool2linux_${ZFSPKGVER}_amd64.deb		\
+libnvpair1_${ZFSPKGVER}_amd64.deb 		\
+libuutil1_${ZFSPKGVER}_amd64.deb		\
+libzfs2_${ZFSPKGVER}_amd64.deb			\
+libzfs-dev_${ZFSPKGVER}_amd64.deb		\
+libzpool2_${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-initramfs_${ZFSPKGVER}_amd64.deb		\
+zfsutils_${ZFSPKGVER}_amd64.deb

-DEBS=${SPL_DEBS} ${ZFS_DEBS}
+DEBS=${SPL_DEBS} ${ZFS_DEBS} 

-all: deb
+all: ${DEBS}
+
+.PHONY: deb
 deb: ${DEBS}

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

-.PHONY: submodule
-submodule:
-	test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
-	test -f "${SPLSRC}/debian/changelog" || git submodule update --init
-
 .PHONY: spl
 spl ${SPL_DEBS}: ${SPLSRC}
 	rm -rf ${SPLDIR}
-	mkdir ${SPLDIR}
-	cp -a ${SPLSRC}/* ${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}; ./debian/rules override_dh_prep-base-deb-files
 	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us

 .PHONY: zfs
-zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
+zfs ${ZFS_DEBS}: ${ZFSSRC}
 	rm -rf ${ZFSDIR}
-	mkdir ${ZFSDIR}
-	cp -a ${ZFSSRC}/* ${ZFSDIR}/
+	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
+	cd ${ZFSDIR}; ./debian/rules override_dh_prep-base-deb-files
+	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
+
+.PHONY: download
+download:
+	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
+	git clone -b master/debian/wheezy/0.6.5.7-3-wheezy https://github.com/zfsonlinux/pkg-spl.git
+	git clone -b master/debian/wheezy/0.6.5.7-8-wheezy https://github.com/zfsonlinux/pkg-zfs.git
+	tar czf ${SPLSRC} pkg-spl
+	tar czf ${ZFSSRC} pkg-zfs

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

 .PHONY: distclean
 distclean: clean
@@ -76,4 +81,4 @@ distclean: clean

 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch amd64
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --dist wheezy
@@ -10,4 +10,4 @@ modules with the kernel.

 For licensing questions, see:

-http://open-zfs.org/wiki/Talk:FAQ
+http://open-zfs.org/wiki/Talk:FAQ
@@ -1,114 +1,61 @@
-spl-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
+spl-linux (0.6.5.7-5~bpo70) unstable; urgency=low

-  * update SPL to 0.7.4
+  * rebuild using wheezy

- -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 15:41:00 +0200

-spl-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
+spl-linux (0.6.5.7-4~bpo70) unstable; urgency=low

-  * update spl to 0.7.3
+  * update pkg-spl to spl-0.6.5.7-3-wheezy

- -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
+  * change versioning scheme to allow upgrades from PVE 3.4 to PVE 4.2

-spl-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 13:45:00 +0200

-  * update spl to 0.7.2
-
-  * clean up man pages
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:33:04 +0200
-
-spl-linux (0.6.5.11-pve10~bpo90) unstable; urgency=medium
-
-  * update spl to debian/0.6.5.11-1
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
-
-spl-linux (0.6.5.9-pve9~bpo90) unstable; urgency=medium
-
-  * rebuild for PVE 5.0 / Debian Stretch
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
-
-spl-linux (0.6.5.9-pve8~bpo80) unstable; urgency=medium
-
-  * update spl to debian/0.6.5.9-1
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:35 +0100
-
-spl-linux (0.6.5.8-pve7~bpo80) unstable; urgency=medium
-
-  * update spl to debian/0.6.5.8-2
-
-  * switch package upstream sources to Debian (Jessie)
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
-
-spl-linux (0.6.5.7-pve6~bpo80) unstable; urgency=medium
-
-  * update pkg-spl to jessie/0.6.5.7-5
-
-  * change package versioning to allow upgrades from PVE3/wheezy
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
-
-spl-linux (0.6.5-pve5~jessie) unstable; urgency=medium
-
-  * Update pkg-spl to jessie/0.6.5.6-3
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Apr 2016 11:11:59 +0200
-
-spl-linux (0.6.5-pve4~jessie) unstable; urgency=medium
+spl-linux (0.6.5-3~wheezy) unstable; urgency=low

  * update to 0.6.5.6

- -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:49:49 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:38 +0200

-spl-linux (0.6.5-pve3~jessie) unstable; urgency=medium
+spl-linux (0.6.5-2~wheezy) unstable; urgency=low

  * update to 0.6.5.4

- -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 11:00:40 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 17 Jan 2016 14:44:31 +0100

-spl-linux (0.6.5-pve2~jessie) unstable; urgency=medium
+spl-linux (0.6.5-1~wheezy) unstable; urgency=low

-  * update to 0.6.5.3
+  * update to master/debian/wheezy/0.6.5-1-wheezy

- -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:40:58 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:03:25 +0200

-spl-linux (0.6.5-pve1~jessie) unstable; urgency=medium
+spl-linux (0.6.4-4~wheezy) unstable; urgency=low

-  * update to master/debian/jessie/0.6.5-1
+  * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy)

- -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:04:23 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 07:16:12 +0200

-spl-linux (0.6.4-pve3~jessie) unstable; urgency=medium
+spl-linux (0.6.4-3~wheezy) unstable; urgency=low

-  * update to snapshot/debian/jessie/0.6.4-8-8ac6ff
+  * update to 0.6.4.1

- -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:14:12 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:14 +0200

-spl-linux (0.6.4-pve2~jessie) unstable; urgency=medium
+spl-linux (0.6.4-2~wheezy) unstable; urgency=low

-  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)
+  * include original zol changelog files

- -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:02:31 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 07:38:02 +0200

-spl-linux (0.6.4-pve1~jessie) unstable; urgency=medium
+spl-linux (0.6.4-1~wheezy) unstable; urgency=low

-  * update to 0.6.4 (use upstream zol package definitions)
+  * update to 0.6.4 (keep Proxmox VE versioning schema)

- -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:17:26 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Apr 2015 09:32:24 +0200

-spl-linux (0.6.3-pve1~jessie) unstable; urgency=medium
-
-  * 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
+spl-linux (0.6.3-1~wheezy) unstable; urgency=low

  * first version for Proxmox VE

 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
-
@@ -1,163 +0,0 @@
-From 8c0a5dd331d746c5c114dda69f2eb5a4a0ac8eb9 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/control    |  1 -
- debian/rules      | 68 +------------------------------------------------------
- 3 files changed, 1 insertion(+), 92 deletions(-)
-
-diff --git a/debian/control.in b/debian/control.in
-index 6846796..786e689 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: 4.1.2
- 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/control b/debian/control
-index 6846796..af4b7bb 100644
--- a/debian/control
-+++ b/debian/control
-@@ -8,7 +8,6 @@ Build-Depends: autogen,
-                autotools-dev,
-                debhelper (>= 9),
-                dh-autoreconf,
-               dkms (>> 2.2.0.2-1~),
-                libtool
- Standards-Version: 4.1.2
- Homepage: http://www.zfsonlinux.org/
-diff --git a/debian/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.14.2
-
@@ -0,0 +1,119 @@
+Index: new/debian/rules
+===================================================================
+--- new.orig/debian/rules	2015-10-09 10:02:21.000000000 +0200
+++ new/debian/rules	2015-10-09 10:12:04.000000000 +0200
+@@ -22,9 +22,7 @@
+ KVERS=$(shell uname -r | sed 's/-$(DEB_HOST_ARCH)//')
+ endif
+ 
+-CFG_OPTS=--without-selinux \
+-	--with-linux=$(KSRC) \
+-	--with-linux-obj=$(KOBJ)
+CFG_OPTS=--without-selinux
+ 
+ non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
+ PACKAGE=spl
+@@ -33,7 +31,7 @@
+ KIMGVER=$(shell dpkg -s linux-image-$(KVERS)-$(DEB_HOST_ARCH) | grep ^Version | sed 's/.*: //')
+ 
+ %:
+-	dh $@ --with dkms --parallel
+	dh $@ --parallel
+ 
+ override_dh_prep-base-deb-files:
+ 	sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g' < debian/control.in > debian/control
+@@ -75,59 +73,6 @@
+ 	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
+ 	$(MAKE) distdir
+ 
+-	@# Install the DKMS source.
+-	@# We only want the files needed to build the modules
+-	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
+-	touch '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/.nogitrelease'
+-	cp '$(CURDIR)/autogen.sh' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/'
+-	( for d in include module config; do \
+-	     rm -Rf $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/$$d; \
+-	done)
+-	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
+-	@# Hellish awk line:
+-	@#  * Deletes from configure.ac the parts not needed for building the kernel module
+-	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
+-	@#        (Makefile$|include/|module/|*.release$)
+-	@#  * Takes care of spaces and tabs
+-	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|spl\.release([ \t]+)?$$))/){next} } {print}' \
+-		'$(CURDIR)/$(NAME)-$(VERSION)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/configure.ac'
+-	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
+-	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
+-		'$(CURDIR)/$(NAME)-$(VERSION)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
+-	@# Sanity test
+-	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
+-	@# Run autogen on the stripped source tree
+-	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
+-	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache'
+-
+-	@# This shunt allows DKMS to install the Module.symvers and spl_config.h
+-	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
+-	echo '#!/bin/sh'  >'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
+-	echo 'cp "$$@"'  >>'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
+-	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
+-
+-	@# Duplicate the dkms directory for module-assistant source package
+-	install -d $(CURDIR)/debian/tmp/usr/src/modules
+-	cp -r $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION) $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)
+-	mkdir -p $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian
+-	cp debian/copyright debian/module/* \
+-	    $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/
+-	sed 's/^spl-linux /spl-modules /' debian/changelog \
+-	    > $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/changelog
+-	chmod 755 $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/rules
+-	chown -R root.src $(CURDIR)/debian/tmp
+-	find $(CURDIR)/debian/tmp/usr/src -type d | xargs chmod 755
+-	find $(CURDIR)/debian/tmp/usr/src -type f -perm -100 | xargs chmod 755
+-	find $(CURDIR)/debian/tmp/usr/src -type f -not -perm -100 | xargs chmod 644
+-	chmod 775 $(CURDIR)/debian/tmp/usr/src/modules
+-	cd $(CURDIR)/debian/tmp/usr/src && tar cf $(PACKAGE).tar modules
+-	rm -Rf $(CURDIR)/debian/tmp/usr/src/modules
+-	bzip2 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar
+-	chmod 644 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2
+-	install -d $(CURDIR)/debian/spl-modules-source/usr/src
+-	mv $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2 $(CURDIR)/debian/spl-modules-source/usr/src/
+-	rm -Rf $(CURDIR)/debian/spl-modules-source/usr/src/$(NAME)-$(VERSION)
+-
+ override_dh_dkms:
+ 	dh_dkms -V $(VERSION)
+ 
+Index: new/debian/control.in
+===================================================================
+--- new.orig/debian/control.in	2015-10-09 10:02:21.000000000 +0200
+++ new/debian/control.in	2015-10-09 10:12:44.000000000 +0200
+@@ -35,30 +35,6 @@
+  This package provides the source to the SPL kernel module in a form
+  suitable for use by module-assistant or kernel-package.
+ 
+-Package: spl-dkms
+-Architecture: all
+-Depends: linux-headers-amd64, libc6-dev, ${misc:Depends}, dkms (>> 2.1.1.2-5), lsb-release, file
+-Recommends: spl (>= ${source:Upstream-Version})
+-Provides: spl-modules
+-Conflicts: spl-modules-source
+-Replaces: spl-modules-source
+-Description: Solaris Porting Layer kernel modules for Linux
+- The Solaris Porting Layer (SPL) is a Linux kernel module which provides
+- many of the Solaris kernel APIs. This shim layer makes it possible to
+- run Solaris kernel code in the Linux kernel with relatively minimal
+- modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
+- module which provides a testing harness for the SPL module.
+- .
+- SPL can be particularly useful when you want to track upstream Illumos
+- (or any other OpenSolaris fork) development closely and don't want the
+- overhead of maintaining a large patch which converts Solaris primitives
+- to Linux primitives.
+- .
+- This package contains the source code for the SPL and SPLAT Linux kernel
+- modules, which can be used with DKMS, so that local kernel modules are
+- automatically built and installed every time the kernel packages are
+- upgraded.
+-
+ Package: spl
+ Architecture: linux-any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -1 +1 @@
-0001-remove-DKMS-and-module-build.patch
+fix-control
@@ -1,197 +1,74 @@
-zfs-linux (0.7.4-pve2~bpo9) unstable; urgency=medium
+zfs-linux (0.6.5.7-5~bpo70) unstable; urgency=low

-  * cherry-pick ARC hit rate fix from 0.7.6
+  * rebuild using wheezy

-  * always load ZFS modules on boot
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 15:41:00 +0200

- -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Jan 2018 11:31:14 +0100
+zfs-linux (0.6.5.7-4~bpo70) unstable; urgency=low

-zfs-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
+  * update pkg-zfs to 0.6.5.7-8-wheezy

-  * update ZFS to 0.7.4
+  * drop unneeded/non-upstream pull requests:
+    - #1099: iSCSI support for ZoL
+    - #1476: Change sharesmb to use REGISTRY shares for better control by user/admin
+    - #2790: Rewrite of nfs.c to keep options per host separated.
+    - #3238: Allow "zfs unshare <proto> -a" much like "zfs share <proto> -a" (WIP)

- -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
+  * change versioning scheme to allow upgrades from PVE 3.4 to PVE 4.2

-zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 13:45:00 +0200

-  * update ZFS to 0.7.3
+zfs-linux (0.6.5-3~wheezy) unstable; urgency=low

-  * include fix for user namespace setgid issue (#6800 upstream)
+  * update to 0.6.5.6

- -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:59 +0200

-zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
+zfs-linux (0.6.5-2~wheezy) unstable; urgency=low

-  * update zfs to 0.7.2
+  * update to 0.6.5.4

-  * add PR 6616 - zfs send/recv compatibility with 0.6.5
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 17 Jan 2016 14:44:55 +0100

-  * add PR 6695 - zfs recv: don't skip over objects which should be freed
+zfs-linux (0.6.5-1~wheezy) unstable; urgency=low

-  * various small fixes
+  * update to master/debian/wheezy/0.6.5.2-2-wheezy 

-  * split test suite into zfs-test package
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:04:04 +0200

- -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:34:05 +0200
+zfs-linux (0.6.4-4~wheezy) unstable; urgency=low

-zfs-linux (0.6.5.11-pve18~bpo90) unstable; urgency=medium
+  * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy)
+  
+  * use upstream version of /etc/default/zfs

-  * fix #1509: arc_summary error with L2ARC
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 07:17:40 +0200

- -- Proxmox Support Team <support@proxmox.com>  Mon, 2 Oct 2017 09:30:41 +0200
+zfs-linux (0.6.4-3~wheezy) unstable; urgency=low

-zfs-linux (0.6.5.11-pve17~bpo90) unstable; urgency=medium
+  * update to 0.6.4.1
+  
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:44 +0200

-  * update zfs to debian/0.6.5.11-1
+zfs-linux (0.6.4-2~wheezy) unstable; urgency=low

- -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
+  * cleanup /etc/default/zfs
+  
+  * include orignial zol changelog files

-zfs-linux (0.6.5.9-pve16~bpo90) unstable; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 07:30:59 +0200
+ 
+zfs-linux (0.6.4-1~wheezy) unstable; urgency=low

-  * drop transitional packages
+  * update to 0.6.4

-  * convert python scripts to python 3, drop .py suffix
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Apr 2015 09:33:13 +0200

-  * rebuild for PVE 5.0 / Debian Stretch
+zfs-linux (0.6.3-3~wheezy) unstable; urgency=low

- -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
+  * install init.d file for zed daemon

-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
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 14:57:30 +0100

 zfs-linux (0.6.3-2~wheezy) unstable; urgency=low

@@ -206,4 +83,3 @@ zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE

 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
-
@@ -1,274 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Mon, 6 Feb 2017 11:03:10 +0100
-Subject: [PATCH] remove DKMS, modules and dracut build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- debian/control.in    |  36 +++---------------
- debian/control       |   1 -
- debian/not-installed |   1 +
- debian/rules         | 105 +--------------------------------------------------
- 4 files changed, 8 insertions(+), 135 deletions(-)
-
-diff --git a/debian/control.in b/debian/control.in
-index 771fc3a80..edfed470f 100644
--- a/debian/control.in
-+++ b/debian/control.in
-@@ -8,7 +8,6 @@ Uploaders: Aron Xu <aron@debian.org>,
- Build-Depends: dh-autoreconf,
-                autotools-dev,
-                debhelper (>= 10.2),
-               dkms (>> 2.1.1.2-5),
-                libselinux1-dev,
-                libtool,
-                lsb-release,
-@@ -84,25 +83,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}), 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
-@@ -112,23 +97,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}, ${python3:Depends}, python3
-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
-@@ -142,7 +116,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
-@@ -153,7 +127,7 @@ Description: OpenZFS Event Daemon
- Package: zfs-test
- Section: contrib/admin
- Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python
-+Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python
- Breaks: zfsutils-linux (<= 0.6.5.11-1)
- Replaces: zfsutils-linux (<= 0.6.5.11-1)
- Description: OpenZFS test infrastructure an support scripts
-diff --git a/debian/control b/debian/control
-index 771fc3a80..be0b90337 100644
--- a/debian/control
-+++ b/debian/control
-@@ -8,7 +8,6 @@ Uploaders: Aron Xu <aron@debian.org>,
- Build-Depends: dh-autoreconf,
-                autotools-dev,
-                debhelper (>= 10.2),
-               dkms (>> 2.1.1.2-5),
-                libselinux1-dev,
-                libtool,
-                lsb-release,
-diff --git a/debian/not-installed b/debian/not-installed
-index f54fe7310..16b1cef6c 100644
--- a/debian/not-installed
-+++ b/debian/not-installed
-@@ -5,3 +5,4 @@ etc/zfs/vdev_id.conf.alias.example
- etc/zfs/vdev_id.conf.multipath.example
- etc/zfs/vdev_id.conf.sas_direct.example
- etc/zfs/vdev_id.conf.sas_switch.example
-+usr/lib/dracut
-diff --git a/debian/rules b/debian/rules
-index f445b58c5..d71926b33 100755
--- a/debian/rules
-+++ b/debian/rules
-@@ -5,9 +5,6 @@ include /usr/share/dpkg/default.mk
- LSB_DISTRIBUTOR := $(shell lsb_release -is)
- NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
- 
-DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
-		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
-
- ifndef BUILD_UDEB
- BUILD_UDEB=false
- endif
-@@ -17,21 +14,16 @@ KVERS=$(shell uname -r)
- endif
- 
- ifndef SPL
-SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
-endif
-
-ifndef SPLOBJ
-SPLOBJ=/var/lib/dkms/spl/$(DEB_VERSION_UPSTREAM)/$(KVERS)/$(DEB_TARGET_GNU_CPU)
-+SPL=../spl-build
- endif
- 
- non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
- PACKAGE=zfs
-pmodules = $(PACKAGE)-modules-$(non_epoch_version)
- 
- export DEB_BUILD_MAINT_OPTIONS = hardening=+all
- 
- %:
-	dh $@ --with autoreconf,dkms,python3,systemd --parallel
-+	dh $@ --with autoreconf,python3,systemd --parallel
- 
- override_dh_auto_configure:
- 	@cp debian/control.in debian/control
-@@ -73,36 +65,6 @@ override_dh_auto_install:
- 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
- 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
- 
-	@# Get a bare copy of the source code for DKMS.
-	@# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
-	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
-	$(MAKE) distdir
-
-	@# Install the DKMS source.
-	@# We only want the files needed to build the modules
-	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'
-	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)' || exit 1;)
-	@# Hellish awk line:
-	@#  * Deletes from configure.ac the parts not needed for building the kernel module
-	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
-	@#        (Makefile$|include/|module/|*.release$)
-	@#  * Takes care of spaces and tabs
-	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
-		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac'
-	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
-	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
-		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
-	@# Sanity test
-	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
-	@# Run autogen on the stripped source tree
-	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'; ./autogen.sh
-	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/autom4te.cache'
-
-	@# This shunt allows DKMS to install the Module.symvers and zfs_config.h
-	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
-	printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'
-	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'
-
- 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
- 	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
- 		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
-@@ -112,9 +74,6 @@ override_dh_auto_install:
- 	chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
- 	chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
- 
-override_dh_dkms:
-	dh_dkms -V $(DEB_VERSION_UPSTREAM)
-
- override_dh_makeshlibs:
- 	dh_makeshlibs -a -V
- ifeq ($(BUILD_UDEB), true)
-@@ -152,65 +111,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.14.2
-
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Mon, 24 Oct 2016 13:47:06 +0200
-Subject: [PATCH] import with -d /dev/disk/by-id in scan service
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- etc/systemd/system/zfs-import-scan.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
-index 227f5b74f..cc428b0d0 100644
--- a/etc/systemd/system/zfs-import-scan.service.in
-+++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
- Type=oneshot
- RemainAfterExit=yes
- ExecStartPre=/sbin/modprobe zfs
-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
-+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
- 
- [Install]
- WantedBy=zfs-import.target
-- 
-2.14.2
-
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Tue, 31 Oct 2017 09:08:42 +0100
-Subject: [PATCH] Use user namespaces for FSETID policy check.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With this we also need to verify the group id of a file with
-the setgid flag has a valid mapping in the current
-namespace.
-
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- module/zfs/policy.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/module/zfs/policy.c b/module/zfs/policy.c
-index 03e8f748b..dbbcfefa3 100644
--- a/module/zfs/policy.c
-+++ b/module/zfs/policy.c
-@@ -42,19 +42,26 @@
-  * all other cases this function must fail and return the passed err.
-  */
- static int
-priv_policy(const cred_t *cr, int capability, boolean_t all, int err)
-+priv_policy_ns(const cred_t *cr, int capability, boolean_t all, int err,
-+    struct user_namespace *ns)
- {
- 	ASSERT3S(all, ==, B_FALSE);
- 
- 	if (cr != CRED() && (cr != kcred))
- 		return (err);
- 
-	if (!capable(capability))
-+	if (!(ns ? ns_capable(ns, capability) : capable(capability)))
- 		return (err);
- 
- 	return (0);
- }
- 
-+static int
-+priv_policy(const cred_t *cr, int capability, boolean_t all, int err)
-+{
-+	return priv_policy_ns(cr, capability, all, err, NULL);
-+}
-+
- /*
-  * Checks for operations that are either client-only or are used by
-  * both clients and servers.
-@@ -175,8 +182,11 @@ secpolicy_vnode_setid_retain(const cred_t *cr, boolean_t issuidroot)
- int
- secpolicy_vnode_setids_setgids(const cred_t *cr, gid_t gid)
- {
-+	if (!kgid_has_mapping(cr->user_ns, SGID_TO_KGID(gid)))
-+		return (EPERM);
- 	if (crgetfsgid(cr) != gid && !groupmember(gid, cr))
-		return (priv_policy(cr, CAP_FSETID, B_FALSE, EPERM));
-+		return (priv_policy_ns(cr, CAP_FSETID, B_FALSE, EPERM,
-+		    cr->user_ns));
- 
- 	return (0);
- }
-- 
-2.14.2
-
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Russo <antonio.e.russo@gmail.com>
-Date: Mon, 18 Dec 2017 12:43:55 -0500
-Subject: [PATCH] Enable zfs-import.target in systemd preset (#6968)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Cherry picked line from PR #6822, this enables the new
-target introduced in PR #6764.
-
-Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>
-(cherry picked from commit da16fc5739b1962b3d357246938d2df06d6a1075)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- etc/systemd/system/50-zfs.preset.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in
-index 4d82778e3..884a69b5b 100644
--- a/etc/systemd/system/50-zfs.preset.in
-+++ b/etc/systemd/system/50-zfs.preset.in
-@@ -1,6 +1,7 @@
- # ZFS is enabled by default
- enable zfs-import-cache.service
- disable zfs-import-scan.service
-+enable zfs-import.target
- enable zfs-mount.service
- enable zfs-share.service
- enable zfs-zed.service
-- 
-2.14.2
-
@@ -1,151 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Mon, 8 Jan 2018 09:52:36 -0800
-Subject: [PATCH] Fix ARC hit rate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When the compressed ARC feature was added in commit d3c2ae1
-the method of reference counting in the ARC was modified.  As
-part of this accounting change the arc_buf_add_ref() function
-was removed entirely.
-
-This would have be fine but the arc_buf_add_ref() function
-served a second undocumented purpose of updating the ARC access
-information when taking a hold on a dbuf.  Without this logic
-in place a cached dbuf would not migrate its associated
-arc_buf_hdr_t to the MFU list.  This would negatively impact
-the ARC hit rate, particularly on systems with a small ARC.
-
-This change reinstates the missing call to arc_access() from
-dbuf_hold() by implementing a new arc_buf_access() function.
-
-Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
-Reviewed-by: Tony Hutter <hutter2@llnl.gov>
-Reviewed-by: Tim Chase <tim@chase2k.com>
-Reviewed by: George Wilson <george.wilson@delphix.com>
-Reviewed-by: George Melikov <mail@gmelikov.ru>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #6171
-Closes #6852
-Closes #6989
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- include/sys/arc.h |  1 +
- module/zfs/arc.c  | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
- module/zfs/dbuf.c |  4 +++-
- 3 files changed, 56 insertions(+), 3 deletions(-)
-
-diff --git a/include/sys/arc.h b/include/sys/arc.h
-index 66f37cf71..1ea4937bd 100644
--- a/include/sys/arc.h
-+++ b/include/sys/arc.h
-@@ -221,6 +221,7 @@ void arc_buf_destroy(arc_buf_t *buf, void *tag);
- void arc_buf_info(arc_buf_t *buf, arc_buf_info_t *abi, int state_index);
- uint64_t arc_buf_size(arc_buf_t *buf);
- uint64_t arc_buf_lsize(arc_buf_t *buf);
-+void arc_buf_access(arc_buf_t *buf);
- void arc_release(arc_buf_t *buf, void *tag);
- int arc_released(arc_buf_t *buf);
- void arc_buf_sigsegv(int sig, siginfo_t *si, void *unused);
-diff --git a/module/zfs/arc.c b/module/zfs/arc.c
-index 2b0a78d4b..264e67735 100644
--- a/module/zfs/arc.c
-+++ b/module/zfs/arc.c
-@@ -429,9 +429,14 @@ typedef struct arc_stats {
- 	 * by multiple buffers.
- 	 */
- 	kstat_named_t arcstat_mutex_miss;
-+	/*
-+	 * Number of buffers skipped when updating the access state due to the
-+	 * header having already been released after acquiring the hash lock.
-+	 */
-+	kstat_named_t arcstat_access_skip;
- 	/*
- 	 * Number of buffers skipped because they have I/O in progress, are
-	 * indrect prefetch buffers that have not lived long enough, or are
-+	 * indirect prefetch buffers that have not lived long enough, or are
- 	 * not from the spa we're trying to evict from.
- 	 */
- 	kstat_named_t arcstat_evict_skip;
-@@ -667,6 +672,7 @@ static arc_stats_t arc_stats = {
- 	{ "mfu_ghost_hits",		KSTAT_DATA_UINT64 },
- 	{ "deleted",			KSTAT_DATA_UINT64 },
- 	{ "mutex_miss",			KSTAT_DATA_UINT64 },
-+	{ "access_skip",		KSTAT_DATA_UINT64 },
- 	{ "evict_skip",			KSTAT_DATA_UINT64 },
- 	{ "evict_not_enough",		KSTAT_DATA_UINT64 },
- 	{ "evict_l2_cached",		KSTAT_DATA_UINT64 },
-@@ -4926,7 +4932,51 @@ arc_access(arc_buf_hdr_t *hdr, kmutex_t *hash_lock)
- 	}
- }
- 
-/* a generic arc_done_func_t which you can use */
-+/*
-+ * This routine is called by dbuf_hold() to update the arc_access() state
-+ * which otherwise would be skipped for entries in the dbuf cache.
-+ */
-+void
-+arc_buf_access(arc_buf_t *buf)
-+{
-+	mutex_enter(&buf->b_evict_lock);
-+	arc_buf_hdr_t *hdr = buf->b_hdr;
-+
-+	/*
-+	 * Avoid taking the hash_lock when possible as an optimization.
-+	 * The header must be checked again under the hash_lock in order
-+	 * to handle the case where it is concurrently being released.
-+	 */
-+	if (hdr->b_l1hdr.b_state == arc_anon || HDR_EMPTY(hdr)) {
-+		mutex_exit(&buf->b_evict_lock);
-+		return;
-+	}
-+
-+	kmutex_t *hash_lock = HDR_LOCK(hdr);
-+	mutex_enter(hash_lock);
-+
-+	if (hdr->b_l1hdr.b_state == arc_anon || HDR_EMPTY(hdr)) {
-+		mutex_exit(hash_lock);
-+		mutex_exit(&buf->b_evict_lock);
-+		ARCSTAT_BUMP(arcstat_access_skip);
-+		return;
-+	}
-+
-+	mutex_exit(&buf->b_evict_lock);
-+
-+	ASSERT(hdr->b_l1hdr.b_state == arc_mru ||
-+	    hdr->b_l1hdr.b_state == arc_mfu);
-+
-+	DTRACE_PROBE1(arc__hit, arc_buf_hdr_t *, hdr);
-+	arc_access(hdr, hash_lock);
-+	mutex_exit(hash_lock);
-+
-+	ARCSTAT_BUMP(arcstat_hits);
-+	ARCSTAT_CONDSTAT(!HDR_PREFETCH(hdr), demand, prefetch,
-+	    !HDR_ISTYPE_METADATA(hdr), data, metadata, hits);
-+}
-+
-+/* a generic arc_read_done_func_t which you can use */
- /* ARGSUSED */
- void
- arc_bcopy_func(zio_t *zio, arc_buf_t *buf, void *arg)
-diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
-index 60f52d294..4ee121f5a 100644
--- a/module/zfs/dbuf.c
-+++ b/module/zfs/dbuf.c
-@@ -2719,8 +2719,10 @@ __dbuf_hold_impl(struct dbuf_hold_impl_data *dh)
- 		return (SET_ERROR(ENOENT));
- 	}
- 
-	if (dh->dh_db->db_buf != NULL)
-+	if (dh->dh_db->db_buf != NULL) {
-+		arc_buf_access(dh->dh_db->db_buf);
- 		ASSERT3P(dh->dh_db->db.db_data, ==, dh->dh_db->db_buf->b_data);
-+	}
- 
- 	ASSERT(dh->dh_db->db_buf == NULL || arc_referenced(dh->dh_db->db_buf));
- 
-- 
-2.14.2
-
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Fri, 19 Jan 2018 12:13:46 +0100
-Subject: [PATCH] always load ZFS module on boot
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-since zfs-import-scan.service is disabled by default, and
-zfs-import-cache.service only gets started if a cache file exists, this
-is needed for zfs-mount, zfs-share and zfs-zed services in case ZFS is
-not actually used.
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- etc/modules-load.d/zfs.conf.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in
-index 8b41baa30..59b058c9a 100644
--- a/etc/modules-load.d/zfs.conf.in
-+++ b/etc/modules-load.d/zfs.conf.in
-@@ -1,3 +1,3 @@
- # Always load kernel modules at boot.  The default behavior is to load the
- # kernel modules in the zfs-import-*.service or when blkid(8) detects a pool.
-#zfs
-+zfs
-- 
-2.14.2
-
@@ -0,0 +1,143 @@
+Index: new/debian/control.in
+===================================================================
+--- new.orig/debian/control.in	2015-10-09 10:02:40.000000000 +0200
+++ new/debian/control.in	2015-10-09 10:15:36.000000000 +0200
+@@ -104,39 +104,9 @@
+  This package provides the source to the SPL kernel module in a form
+  suitable for use by module-assistant or kernel-package.
+ 
+-Package: zfs-dkms
+-Architecture: all
+-Pre-Depends: spl-dkms
+-Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}, file
+-Recommends: zfsutils
+-Replaces: lzfs, lzfs-dkms, zfs-modules-source
+-Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules, zfs-modules-source
+-Conflicts: lzfs, lzfs-dkms, zfs-modules-source
+-Description: Native ZFS filesystem kernel modules for Linux
+- The Z file system is a pooled filesystem designed for maximum data
+- integrity, supporting data snapshots, multiple copies, and data
+- checksums.
+- .
+- This DKMS package includes the SPA, DMU, ZVOL, and ZPL components of ZFS.
+-
+-Package: zfs-dracut
+-Section: utils
+-Architecture: linux-any
+-Depends: dracut,
+- zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version}),
+- zfsutils, ${misc:Depends}
+-Description: Native ZFS root filesystem capabilities for Linux
+- The Z file system is a pooled filesystem designed for maximum data
+- integrity, supporting data snapshots, multiple copies, and data
+- checksums.
+- .
+- This package adds ZFS to the system initramfs with a hook
+- for the dracut infrastructure.
+-
+ Package: zfs-initramfs
+ Architecture: linux-any
+ Depends: initramfs-tools, busybox,
+- zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version}),
+  zfsutils, ${misc:Depends}
+ Description: Native ZFS root filesystem capabilities for Linux
+  The Z file system is a pooled filesystem designed for maximum data
+@@ -150,7 +120,6 @@
+ Section: admin
+ Architecture: linux-any
+ Depends: initscripts, lsb-base, python, ${misc:Depends}, ${shlibs:Depends}
+-Recommends: zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version})
+ Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
+ Conflicts: zfs, zfs-fuse
+ Replaces: zfs
+Index: new/debian/rules
+===================================================================
+--- new.orig/debian/rules	2015-10-09 10:02:40.000000000 +0200
+++ new/debian/rules	2015-10-09 10:14:14.000000000 +0200
+@@ -25,12 +25,10 @@
+ endif
+ 
+ ifndef SPL
+-SPLSRC=/usr/src/spl-$(VERSION)
+SPLSRC=../pkg-spl
+ endif
+ 
+-CFG_OPTS=--with-linux=$(KSRC) \
+-	 --with-linux-obj=$(KOBJ) \
+-	 --with-spl=$(SPLSRC)
+CFG_OPTS=--with-spl=$(SPLSRC)
+ 
+ non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
+ PACKAGE=zfs
+@@ -83,42 +81,6 @@
+ 	@# Install the utilities.
+ 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
+ 
+-	@# Get a bare copy of the source code for DKMS.
+-	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree, which does not
+-	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
+-	$(MAKE) distdir
+-
+-	@# Install the DKMS source.
+-	@# We only want the files needed to build the modules
+-	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
+-	touch '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/.nogitrelease'
+-	cp '$(CURDIR)/autogen.sh' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/'
+-	( for d in include module config; do \
+-	     rm -Rf $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/$$d; \
+-	done)
+-	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
+-	@# Hellish awk line:
+-	@#  * Deletes from configure.ac the parts not needed for building the kernel module
+-	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
+-	@#        (Makefile$|include/|module/|*.release$)
+-	@#  * Takes care of spaces and tabs
+-	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
+-		'$(CURDIR)/$(NAME)-$(VERSION)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/configure.ac'
+-	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
+-	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
+-		'$(CURDIR)/$(NAME)-$(VERSION)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
+-	@# Sanity test
+-	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
+-	@# Run autogen on the stripped source tree
+-	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
+-	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache'
+-
+-	@# This shunt allows DKMS to install the Module.symvers and zfs_config.h
+-	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
+-	echo '#!/bin/sh'  >'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
+-	echo 'cp "$$@"'  >>'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
+-	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
+-
+ 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
+ 	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
+ 		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
+@@ -137,28 +99,6 @@
+ 	# Fix the includes according to https://github.com/zfsonlinux/zfs/issues/2903
+ 	./debian/fix_includes-libspl.sh
+ 
+-	@# Duplicate the dkms directory for module-assistant source package
+-	install -d $(CURDIR)/debian/tmp/usr/src/modules
+-	cp -r $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION) $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)
+-	mkdir -p $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian
+-	cp debian/copyright debian/module/* \
+-	    $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/
+-	sed 's/^zfs-linux /zfs-modules /' debian/changelog \
+-	    > $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/changelog
+-	chmod 755 $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/rules
+-	chown -R root.src $(CURDIR)/debian/tmp
+-	find $(CURDIR)/debian/tmp/usr/src -type d | xargs chmod 755
+-	find $(CURDIR)/debian/tmp/usr/src -type f -perm -100 | xargs chmod 755
+-	find $(CURDIR)/debian/tmp/usr/src -type f -not -perm -100 | xargs chmod 644
+-	chmod 775 $(CURDIR)/debian/tmp/usr/src/modules
+-	cd $(CURDIR)/debian/tmp/usr/src && tar cf $(PACKAGE).tar modules
+-	rm -Rf $(CURDIR)/debian/tmp/usr/src/modules
+-	bzip2 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar
+-	chmod 644 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2
+-	install -d $(CURDIR)/debian/zfs-modules-source/usr/src
+-	mv $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2 $(CURDIR)/debian/zfs-modules-source/usr/src/
+-	rm -Rf $(CURDIR)/debian/zfs-modules-source/usr/src/$(NAME)-$(VERSION)
+-
+ override_dh_installinit:
+ 	@# Install systemd files
+ 	dh_systemd_enable -pzfsutils etc/systemd/system/zfs.target
@@ -1,6 +1,2 @@
-0001-remove-DKMS-modules-and-dracut-build.patch
-0002-import-with-d-dev-disk-by-id-in-scan-service.patch
-0003-Use-user-namespaces-for-FSETID-policy-check.patch
-0004-Enable-zfs-import.target-in-systemd-preset-6968.patch
-0005-Fix-ARC-hit-rate.patch
-0006-always-load-ZFS-module-on-boot.patch
+fix-control.patch
+skip-unneeded-pull-requests.patch
@@ -0,0 +1,21 @@
+diff --git a/debian/patches/series b/debian/patches/series
+index ffafe6c..9823273 100644
+--- a/debian/patches/series
+++ b/debian/patches/series
+@@ -1,12 +1,12 @@
+ 0002-Prevent-manual-builds-in-the-DKMS-source.patch
+ 0005-Remove-userland-dist-rules.patch
+ libzfs-dependencies
+-PR1099.patch
+-PR1476.patch
+#PR1099.patch
+#PR1476.patch
+ PR1867.patch
+ PR2668.patch
+-PR2790.patch
+-PR3238.patch
+#PR2790.patch
+#PR3238.patch
+ PR3465.patch
+ PR3559.patch
+ PR3560.patch
Author	SHA1	Message	Date
Fabian Grünbichler	93440c1975	bump version, update changelog	2016-06-28 15:41:47 +02:00
Fabian Grünbichler	8d4db41b48	fix make upload target	2016-06-28 15:27:06 +02:00
Fabian Grünbichler	d5aecb0120	add make deb target	2016-06-28 14:35:56 +02:00
Fabian Grünbichler	787eca93c4	update make upload target	2016-06-28 14:35:35 +02:00
Fabian Grünbichler	e2380c2a18	update source archives	2016-06-28 14:35:23 +02:00
Fabian Grünbichler	9ccb7a65af	update changelogs	2016-06-28 14:35:12 +02:00
Fabian Grünbichler	b6cafe691d	update changelogs	2016-06-28 13:51:08 +02:00
Fabian Grünbichler	6d5485395f	drop unneeded/non-upstream pull requests - #1099: iSCSI support for ZoL - #1476: Change sharesmb to use REGISTRY shares for better control by user/admin - #2790: Rewrite of nfs.c to keep options per host separated. - #3238: Allow "zfs unshare <proto> -a" much like "zfs share <proto> -a" (WIP)	2016-06-28 13:50:15 +02:00
Fabian Grünbichler	e34fbf907c	update to zfs/spl 0.6.5.7 update pkg-zfs to zfs-0.6.5.7-8-wheezy update pkg-spl to spl-0.6.5.7-3-wheezy change package versioning scheme drop cherry-pick workarounds	2016-06-28 13:49:32 +02:00
Dietmar Maurer	a96c6ce442	update to zfs/spl 0.6.5.6	2016-03-30 11:34:48 +02:00
Dietmar Maurer	a0ba3b44a3	update to 0.6.5.4	2016-01-17 15:32:47 +01:00
Dietmar Maurer	8b01c7a110	update to 0.6.5.2	2015-10-09 10:25:57 +02:00
Dietmar Maurer	69aebd7324	update to 0.6.4.2	2015-07-21 08:01:23 +02:00
Dietmar Maurer	0ca48f6b95	update to 0.6.4.1	2015-04-30 07:32:22 +02:00
Dietmar Maurer	4b9f6205df	fix typo	2015-04-14 10:20:51 +02:00
Dietmar Maurer	ead682fb07	remove DKMS settings from /etc/default/zfs	2015-04-14 08:00:31 +02:00
Dietmar Maurer	2f2b265609	fix changelogs	2015-04-14 07:56:26 +02:00
Dietmar Maurer	cefdaf9301	remove unused files	2015-04-13 08:35:28 +02:00
Dietmar Maurer	e37bd2ebdc	use packages from github	2015-04-13 08:31:33 +02:00
Dietmar Maurer	cc8c8584d9	bump version to 0.6.4-1~wheezy	2015-04-12 09:40:23 +02:00
Dietmar Maurer	532f0e92a0	update sources to 0.6.4	2015-04-12 09:27:14 +02:00
Dietmar Maurer	67f0ab4538	set RELEASE=3.4	2015-03-15 15:01:54 +01:00
Dietmar Maurer	eb1b8b66b7	bump zfs package version to 0.6.3-3	2015-03-15 14:57:38 +01:00
Dietmar Maurer	a7c83d2c0c	install init.d file for zed	2015-03-15 14:55:53 +01:00