Drop patches for DKMS error messages.

The PPA has been shipping a dkms package with the BUILD_DEPENDS patch for more
than six months, and it still seems to be the best solution vice the
alternatives, so these patches are obsolete:

* 0006-Improve-the-with-spl-error-for-DKMS-systems.patch
* 0007-Improve-the-SPL-version-error-for-DKMS-systems.patch

diff --git a/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch b/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch
deleted file mode 100644 (file)
index aabb03c..0000000
--- a/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Darik Horn <dajhorn@vanadac.com>
-Date: Fri, 3 Feb 2012 14:49:49 -0600
-Subject: Improve the --with-spl error for DKMS systems.
-
-If the SPL module is unavailable, then the operator gets an error
-message that does not apply to installations that are mananged by
-DKMS. Change the error message to fit apt-get systems.
-
-A better solution would be to implement a dependency model in DKMS,
-or to bundle SPL into the ZFS package.
----
- config/kernel.m4 |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index 6d28074..a97473e 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -329,9 +329,10 @@ AC_DEFUN([ZFS_AC_SPL], [
-               ], [
-                       AC_MSG_RESULT([Not found])
-                       AC_MSG_ERROR([
--      *** Please make sure the spl devel package for your distribution
--      *** is installed then try again.  If that fails you can specify the
--      *** location of the spl source with the '--with-spl=PATH' option.])
-+      *** ZFS depends on the SPL kernel module, which is not found.
-+      *** DKMS should retry zfs-dkms momentarily after building spl-dkms.
-+      *** If this error message persists, or if you are running DKMS manually,
-+      *** then run 'apt-get install --reinstall spl-dkms' and try again.])
-               ])
-       ], [
-               AS_IF([test "$splsrc" = "NONE"], [
--- 

diff --git a/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch b/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
deleted file mode 100644 (file)
index b677b60..0000000
--- a/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Darik Horn <dajhorn@vanadac.com>
-Date: Fri, 13 Apr 2012 09:22:29 -0500
-Subject: Improve the SPL version error for DKMS systems.
-
-During kernel package upgrades, if DKMS tries to build the ZFS
-modules before the SPL module, then the operator gets an error
-message that does not apply to installations that are mananged by
-DKMS. Change the error message to fit apt-get systems.
-
-A better solution would be to implement a dependency model in DKMS,
-or to bundle SPL into the ZFS package.
-
-Closes: dajhorn/pkg-zfs#30
----
- config/kernel.m4 |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index a97473e..d3e132e 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -362,7 +362,10 @@ AC_DEFUN([ZFS_AC_SPL], [
-               AC_MSG_RESULT([Not found])
-               AC_MSG_ERROR([
-       *** Cannot determine the version of the spl source.
--      *** Please prepare the spl source before running this script])
-+      *** ZFS depends on the SPL kernel module, which is not yet ready.
-+      *** DKMS should retry zfs-dkms momentarily after building spl-dkms.
-+      *** If this error message persists, or if you are running DKMS manually,
-+      *** then run 'apt-get install --reinstall spl-dkms' and try again.])
-       ])
- 
-       AC_MSG_RESULT([$splsrcver])
--- 

diff --git a/debian/patches/series b/debian/patches/series
index 60c3a9b3d1444d1bac7bf6aad5526b4c05dee254..5acdbe68d4bc9245f0a6ec9f2a94b28ae8647711 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@
 0003-Remove-all-upstream-init.d-components.patch
 0004-Remove-the-upstream-dracut-component.patch
 0005-Remove-userland-dist-rules.patch
-0006-Improve-the-with-spl-error-for-DKMS-systems.patch
-0007-Improve-the-SPL-version-error-for-DKMS-systems.patch