From a95ebe2855d258cf1c16a5834be658d953185154 Mon Sep 17 00:00:00 2001
From: Darik Horn <dajhorn@vanadac.com>
Date: Tue, 17 Jan 2012 19:45:07 -0600
-Subject: [PATCH 1/5] Prevent manual builds in the DKMS source.
+Subject: [PATCH 1/6] Prevent manual builds in the DKMS source.
Print an instructive error messsage and exit if the `dkms.conf` file
exists when the userland is configured. (ie: `--with-config=user`)
From 7d69e1d459591ff803a734792e6ded1d39e0e8bb Mon Sep 17 00:00:00 2001
From: Darik Horn <dajhorn@vanadac.com>
Date: Tue, 17 Jan 2012 22:18:47 -0600
-Subject: [PATCH 2/5] Remove the COPYING file.
+Subject: [PATCH 2/6] Remove the COPYING file.
Resolve this lintian warning by removing the COPYING file:
From a0aa5ffb6145b45f215aeb0579f7825cadce4a17 Mon Sep 17 00:00:00 2001
From: Darik Horn <dajhorn@vanadac.com>
Date: Tue, 17 Jan 2012 11:54:21 -0600
-Subject: [PATCH 3/5] Remove all upstream init.d components.
+Subject: [PATCH 3/6] Remove all upstream init.d components.
The etc/init.d/ components are redundant because the debian/ overlay
bundles init files according to Debian packaging policy.
From 989c7c3eadcf625c90818e57cfe2b181dc9c9cde Mon Sep 17 00:00:00 2001
From: Darik Horn <dajhorn@vanadac.com>
Date: Tue, 17 Jan 2012 20:27:32 -0600
-Subject: [PATCH 4/5] Remove the upstream dracut component.
+Subject: [PATCH 4/6] Remove the upstream dracut component.
The dracut/ component broke deb systems when it first added to the
upstream ZoL repository, had a near-zero download count when it was
From bd7f5b4aabef58094536002d9b6f07822accdc68 Mon Sep 17 00:00:00 2001
From: Darik Horn <dajhorn@vanadac.com>
Date: Tue, 17 Jan 2012 22:23:16 -0600
-Subject: [PATCH 5/5] Remove userland dist rules.
+Subject: [PATCH 5/6] Remove userland dist rules.
The `make dist` rule is used to create the DKMS source package, which
does not contain the userland. (eg: Dist --with-config=kernel only.)
--- /dev/null
+From 37b18ded3bc3db5edf17fe69901e51cf94c20673 Mon Sep 17 00:00:00 2001
+From: Darik Horn <dajhorn@vanadac.com>
+Date: Fri, 3 Feb 2012 14:49:49 -0600
+Subject: [PATCH 6/6] 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 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/config/kernel.m4 b/config/kernel.m4
+index 10a2cdb..84b3f59 100644
+--- a/config/kernel.m4
++++ b/config/kernel.m4
+@@ -248,9 +248,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"], [
+--
+1.7.5.4
+
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
volatile-version.patch
projects / mirror_zfs-debian.git / commitdiff