LU-12017 ldlm: DoM truncate deadlock

[fs/lustre-release.git] / config / lustre-build-linux.m4

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index 9941045..e1b46a3 100644 (file)
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -79,6 +79,7 @@ AC_DEFUN([LB_LINUX_RELEASE], [
        RHEL_KERNEL="no"
        SUSE_KERNEL="no"
        UBUNTU_KERNEL="no"
+       DEBIAN_KERNEL="no"
        # And if any of the above kernels has been detected yet
        KERNEL_FOUND="no"
 
@@ -120,9 +121,23 @@ AC_DEFUN([LB_LINUX_RELEASE], [
                ])
        ])
 
+       # Check for Debian
+       AS_IF([test "x$KERNEL_FOUND" = "xno"], [
+               AC_CACHE_CHECK([for Debian kernel signature], lb_cv_debian_kernel_sig, [
+                       lb_cv_debian_kernel_sig="no"
+                       AS_IF([grep -q "LINUX_PACKAGE_ID\s*\"\s*Debian" $LINUX_OBJ/include/generated/package.h], [
+                               lb_cv_debian_kernel_sig="yes"
+                       ])
+               ])
+               AS_IF([test "x$lb_cv_debian_kernel_sig" = "xyes"], [
+                       DEBIAN_KERNEL="yes"
+                       KERNEL_FOUND="yes"
+               ])
+       ])
+
        # If still no kernel was found, a warning is issued
        AS_IF([test "x$KERNEL_FOUND" = "xno"], [
-               AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE nor Ubuntu])
+               AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE, Ubuntu nor Debian])
        ])
 
        AC_MSG_CHECKING([for Linux kernel module package directory])
@@ -134,7 +149,8 @@ AC_DEFUN([LB_LINUX_RELEASE], [
                AS_IF([test x$RHEL_KERNEL = xyes], [KMP_MODDIR="extra/kernel"],
                          [test x$SUSE_KERNEL = xyes], [KMP_MODDIR="updates/kernel"],
                          [test x$UBUNTU_KERNEL = xyes], [KMP_MODDIR="updates/kernel"],
-                         [AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE nor Ubuntu])]
+                         [test x$DEBIAN_KERNEL = xyes], [KMP_MODDIR="updates/kernel"],
+                         [AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE, Ubuntu nor Debian])]
                )
                IN_KERNEL="${PACKAGE}"])
        AC_MSG_RESULT($KMP_MODDIR)
@@ -259,8 +275,6 @@ LB_CHECK_FILE([$LINUX_CONFIG], [],
        [AC_MSG_ERROR([
 
 Kernel config could not be found.
-
-If you are building from a kernel-source rpm consult build/README.kernel-source
 ])
 ])
 AC_SUBST(LINUX_CONFIG)
@@ -272,7 +286,7 @@ LB_CHECK_FILE([/boot/kernel.h],
 
 AC_ARG_WITH([kernel-source-header],
        AC_HELP_STRING([--with-kernel-source-header=path],
-                       [Use a different kernel version header.  Consult build/README.kernel-source for details.]),
+                       [Use a different kernel version header.]),
        [LB_ARG_CANON_PATH([kernel-source-header], [KERNEL_SOURCE_HEADER])])
 
 # ----------- make dep run? ------------------