LU-15939 build: configure script changes system header and config files

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

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index fbf587e..ef5ee24 100644 (file)
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -11,14 +11,9 @@ makerule="$PWD/build"
 AC_CACHE_CHECK([for external module build target], lb_cv_module_target,
 [
        lb_cv_module_target=""
-       MODULE_TARGET="SUBDIRS"
        rm -f build/conftest.i
-       LB_LINUX_TRY_MAKE([], [],
-               [$makerule LUSTRE_KERNEL_TEST=conftest.i],
-               [test -s build/conftest.i],
-               [lb_cv_module_target="SUBDIRS"],[
        MODULE_TARGET="M"
-       makerule="$PWD/build/"
+       makerule="$PWD/build"
        LB_LINUX_TRY_MAKE([], [],
                [$makerule LUSTRE_KERNEL_TEST=conftest.i],
                [test -s build/conftest.i],
@@ -36,7 +31,7 @@ AC_CACHE_CHECK([for external module build target], lb_cv_module_target,
                [test -s build/conftest.i],
                [lb_cv_module_target="M58"], [
                        AC_MSG_ERROR([kernel module make failed; check config.log for details])
-       ])])])])
+       ])])])
 ])
 AS_IF([test -z "$lb_cv_module_target"],
        [AC_MSG_ERROR([unknown external module build target])],
@@ -97,7 +92,6 @@ 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"
 
@@ -139,20 +133,6 @@ 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"
-               ])
-       ])
-
        # Check for a ELRepo -ml kernel on RHEL 7/8
        AS_IF([test "x$KERNEL_FOUND" = "xno"], [
                AC_CACHE_CHECK([for ELRepo -ml kernel signature on CentOS],
@@ -173,7 +153,7 @@ AC_DEFUN([LB_LINUX_RELEASE], [
 
        # 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, Ubuntu nor Debian])
+               AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE nor Ubuntu])
        ])
 
        AC_MSG_CHECKING([for Linux kernel module package directory])
@@ -185,8 +165,7 @@ 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"],
-                     [test x$DEBIAN_KERNEL = xyes], [KMP_MODDIR="updates/kernel"],
-                     [AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE, Ubuntu nor Debian])]
+                     [AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE nor Ubuntu])]
                )
                IN_KERNEL="${PACKAGE}"])
        AC_MSG_RESULT($KMP_MODDIR)