rebase spl patches

[zfsonlinux.git] / spl-patches / 0001-remove-DKMS-and-module-build.patch

diff --git a/spl-patches/0001-remove-DKMS-and-module-build.patch b/spl-patches/0001-remove-DKMS-and-module-build.patch
index 5225aaae62857020a4bbda6790630e020b2e9fb7..20df65a8d8c7d1e9a88c0988dde1151a77926361 100644 (file)
--- a/spl-patches/0001-remove-DKMS-and-module-build.patch
+++ b/spl-patches/0001-remove-DKMS-and-module-build.patch
@@ -1,7 +1,7 @@
-From 9cb5edffe475c25c4132aace431ffc6a97531583 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 12 Oct 2016 10:57:39 +0200
-Subject: [PATCH 1/3] remove DKMS and module build
+Subject: [PATCH] remove DKMS and module build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,7 +14,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  3 files changed, 1 insertion(+), 92 deletions(-)
 
 diff --git a/debian/control.in b/debian/control.in
-index 52c1660..dc6ee96 100644
+index b910704..786e689 100644
 --- a/debian/control.in
 +++ b/debian/control.in
 @@ -8,40 +8,16 @@ Build-Depends: autogen,
@@ -23,14 +23,14 @@ index 52c1660..dc6ee96 100644
                 dh-autoreconf,
 -               dkms (>> 2.2.0.2-1~),
                 libtool
- Standards-Version: 3.9.8
+ 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}
+-Depends: dkms (>> 2.2.1.0), file, libc-dev, libelf-dev, lsb-release, ${misc:Depends}
 -Recommends: spl (>= ${source:Upstream-Version})
 -Provides: spl-modules
 -Description: Solaris Porting Layer kernel modules for Linux
@@ -59,7 +59,7 @@ index 52c1660..dc6ee96 100644
   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
+index b910704..9ddc12d 100644
 --- a/debian/control
 +++ b/debian/control
 @@ -8,7 +8,6 @@ Build-Depends: autogen,
@@ -68,7 +68,7 @@ index 52c1660..e055965 100644
                 dh-autoreconf,
 -               dkms (>> 2.2.0.2-1~),
                 libtool
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.2
  Homepage: http://www.zfsonlinux.org/
 diff --git a/debian/rules b/debian/rules
 index b2fc86c..a474ca4 100755
@@ -159,5 +159,5 @@ index b2fc86c..a474ca4 100755
 -
 -      dh_builddeb -p${pmodules}
 -- 
-2.14.1
+2.14.2