]> git.proxmox.com Git - mirror_zfs-debian.git/blob - debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
Merge branch 'upstream'
[mirror_zfs-debian.git] / debian / patches / 0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
1 From 799149ba7df2a2a3f7860f321f57904dd5e261d5 Mon Sep 17 00:00:00 2001
2 From: Darik Horn <dajhorn@vanadac.com>
3 Date: Fri, 13 Apr 2012 09:22:29 -0500
4 Subject: [PATCH 7/7] Improve the SPL version error for DKMS systems.
5
6 During kernel package upgrades, if DKMS tries to build the ZFS
7 modules before the SPL module, then the operator gets an error
8 message that does not apply to installations that are mananged by
9 DKMS. Change the error message to fit apt-get systems.
10
11 A better solution would be to implement a dependency model in DKMS,
12 or to bundle SPL into the ZFS package.
13
14 Closes: dajhorn/pkg-zfs#30
15 ---
16 config/kernel.m4 | 5 ++++-
17 1 file changed, 4 insertions(+), 1 deletion(-)
18
19 diff --git a/config/kernel.m4 b/config/kernel.m4
20 index 2516a92..d84462d 100644
21 --- a/config/kernel.m4
22 +++ b/config/kernel.m4
23 @@ -348,7 +348,10 @@ AC_DEFUN([ZFS_AC_SPL], [
24 AC_MSG_RESULT([Not found])
25 AC_MSG_ERROR([
26 *** Cannot determine the version of the spl source.
27 - *** Please prepare the spl source before running this script])
28 + *** ZFS depends on the SPL kernel module, which is not yet ready.
29 + *** DKMS should retry zfs-dkms momentarily after building spl-dkms.
30 + *** If this error message persists, or if you are running DKMS manually,
31 + *** then run 'apt-get install --reinstall spl-dkms' and try again.])
32 ])
33
34 AC_MSG_RESULT([$splsrcver])
35 --
36 1.7.9.5
37