From: Ned Bass <bass6@llnl.gov>
Date: Tue, 5 Jun 2012 19:45:37 +0000 (-0700)
Subject: Improve CONFIG_DEBUG_LOCK_ALLOC error message
X-Git-Tag: debian/0.7.9-2~442^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cac1f230e0537ceddead464dbd140e23a0556be6;p=mirror_zfs-debian.git

Improve CONFIG_DEBUG_LOCK_ALLOC error message

The configure script error message for kernels built with
CONFIG_DEBUG_LOCK_ALLOC may give the impression that the issue is
strictly with license compliance.  To avoid confusion add some words
indicating that the linking stage will fail if the build continues.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #773
---

diff --git a/config/kernel.m4 b/config/kernel.m4
index 0f610007..9e4ac11d 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -374,8 +374,9 @@ AC_DEFUN([ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC], [
 			AC_MSG_RESULT(yes)
 			AC_MSG_ERROR([
 	*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
-	*** with the CDDL license.  You must rebuild your kernel without
-	*** this option enabled.])
+	*** with the CDDL license and will prevent the module linking stage
+	*** from succeeding.  You must rebuild your kernel without this
+	*** option enabled.])
 		])
 		EXTRA_KCFLAGS="$tmp_flags"
 	], [])
diff --git a/configure b/configure
index 9bcc551f..a8e7cb71 100755
--- a/configure
+++ b/configure
@@ -12587,12 +12587,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 $as_echo "yes" >&6; }
 			{ { $as_echo "$as_me:$LINENO: error:
 	*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
-	*** with the CDDL license.  You must rebuild your kernel without
-	*** this option enabled." >&5
+	*** with the CDDL license and will prevent the module linking stage
+	*** from succeeding.  You must rebuild your kernel without this
+	*** option enabled." >&5
 $as_echo "$as_me: error:
 	*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
-	*** with the CDDL license.  You must rebuild your kernel without
-	*** this option enabled." >&2;}
+	*** with the CDDL license and will prevent the module linking stage
+	*** from succeeding.  You must rebuild your kernel without this
+	*** option enabled." >&2;}
    { (exit 1); exit 1; }; }
 
 
@@ -18680,12 +18682,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 $as_echo "yes" >&6; }
 			{ { $as_echo "$as_me:$LINENO: error:
 	*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
-	*** with the CDDL license.  You must rebuild your kernel without
-	*** this option enabled." >&5
+	*** with the CDDL license and will prevent the module linking stage
+	*** from succeeding.  You must rebuild your kernel without this
+	*** option enabled." >&5
 $as_echo "$as_me: error:
 	*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
-	*** with the CDDL license.  You must rebuild your kernel without
-	*** this option enabled." >&2;}
+	*** with the CDDL license and will prevent the module linking stage
+	*** from succeeding.  You must rebuild your kernel without this
+	*** option enabled." >&2;}
    { (exit 1); exit 1; }; }