Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Ned Bass 2012-06-05 12:45:37 -07:00 committed by Brian Behlendorf
parent abe5b8fb66
commit cac1f230e0
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/kernel.m4
View File

@ -374,8 +374,9 @@ AC_DEFUN([ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC], [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
*** with the CDDL license. You must rebuild your kernel without *** with the CDDL license and will prevent the module linking stage
*** this option enabled.]) *** from succeeding. You must rebuild your kernel without this
*** option enabled.])
]) ])
EXTRA_KCFLAGS="$tmp_flags" EXTRA_KCFLAGS="$tmp_flags"
], []) ], [])

20
configure vendored
View File

@ -12587,12 +12587,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
{ { $as_echo "$as_me:$LINENO: error: { { $as_echo "$as_me:$LINENO: error:
*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
*** with the CDDL license. You must rebuild your kernel without *** with the CDDL license and will prevent the module linking stage
*** this option enabled." >&5 *** from succeeding. You must rebuild your kernel without this
*** option enabled." >&5
$as_echo "$as_me: error: $as_echo "$as_me: error:
*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
*** with the CDDL license. You must rebuild your kernel without *** with the CDDL license and will prevent the module linking stage
*** this option enabled." >&2;} *** from succeeding. You must rebuild your kernel without this
*** option enabled." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -18680,12 +18682,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
{ { $as_echo "$as_me:$LINENO: error: { { $as_echo "$as_me:$LINENO: error:
*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
*** with the CDDL license. You must rebuild your kernel without *** with the CDDL license and will prevent the module linking stage
*** this option enabled." >&5 *** from succeeding. You must rebuild your kernel without this
*** option enabled." >&5
$as_echo "$as_me: error: $as_echo "$as_me: error:
*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
*** with the CDDL license. You must rebuild your kernel without *** with the CDDL license and will prevent the module linking stage
*** this option enabled." >&2;} *** from succeeding. You must rebuild your kernel without this
*** option enabled." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }