diff --git a/spl-patches/fix-control.patch b/spl-patches/0001-remove-DKMS-and-module-build.patch similarity index 90% rename from spl-patches/fix-control.patch rename to spl-patches/0001-remove-DKMS-and-module-build.patch index 475839f..6f0acba 100644 --- a/spl-patches/fix-control.patch +++ b/spl-patches/0001-remove-DKMS-and-module-build.patch @@ -1,4 +1,4 @@ -From b750abda7a2b24c52a4fba505571a629223ad64e Mon Sep 17 00:00:00 2001 +From 93897d4241647a64014fb35393461a60c42b1d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 12 Oct 2016 10:57:39 +0200 Subject: [PATCH] remove DKMS and module build @@ -9,8 +9,9 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/control.in | 24 -------------------- + debian/control | 1 - debian/rules | 68 +------------------------------------------------------ - 2 files changed, 1 insertion(+), 91 deletions(-) + 3 files changed, 1 insertion(+), 92 deletions(-) diff --git a/debian/control.in b/debian/control.in index 52c1660..dc6ee96 100644 @@ -57,6 +58,18 @@ index 52c1660..dc6ee96 100644 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 52c1660..e055965 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: 3.9.8 + Homepage: http://www.zfsonlinux.org/ diff --git a/debian/rules b/debian/rules index b2fc86c..a474ca4 100755 --- a/debian/rules @@ -146,5 +159,5 @@ index b2fc86c..a474ca4 100755 - - dh_builddeb -p${pmodules} -- -2.1.4 +2.11.0 diff --git a/spl-patches/series b/spl-patches/series index debb41d..20724b7 100644 --- a/spl-patches/series +++ b/spl-patches/series @@ -1 +1 @@ -fix-control.patch +0001-remove-DKMS-and-module-build.patch diff --git a/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch b/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch index 781d78e..d41b895 100644 --- a/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch +++ b/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch @@ -1,4 +1,4 @@ -From 1e8bad4694e0d0e94ae5596b94f55e434033bb47 Mon Sep 17 00:00:00 2001 +From 6ea6f086a714ed9157f7e880426a71f46f48c2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 6 Feb 2017 11:03:10 +0100 Subject: [PATCH 1/3] remove DKMS, modules and dracut build @@ -9,11 +9,12 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/control.in | 34 +++--------------- + debian/control | 1 - debian/rules | 105 ++---------------------------------------------------- - 2 files changed, 6 insertions(+), 133 deletions(-) + 3 files changed, 6 insertions(+), 134 deletions(-) diff --git a/debian/control.in b/debian/control.in -index 76907e4..235e74c 100644 +index 76907e45..235e74c9 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf, @@ -86,8 +87,20 @@ index 76907e4..235e74c 100644 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/control b/debian/control +index 76907e45..3bcb9a96 100644 +--- a/debian/control ++++ b/debian/control +@@ -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, diff --git a/debian/rules b/debian/rules -index 9efbace..49da706 100755 +index 9efbace6..49da7067 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META) @@ -238,5 +251,5 @@ index 9efbace..49da706 100755 debian-copyright: cme update dpkg-copyright -file debian/copyright.cme -- -2.1.4 +2.11.0