From 9a013c0c217aae50fbeb3016dc7a389ff53bd347 Mon Sep 17 00:00:00 2001 From: Alex Deiter Date: Sun, 12 Jun 2022 12:26:26 -0700 Subject: [PATCH] LU-15939 build: configure script changes system header and config files Remove the SUBDIRS target from configure tests. Since Linux kernel version 2.6.x we can use target M. Test-Parameters: trivial clientdistro=ubuntu2004 Test-Parameters: trivial clientdistro=el8.5 Change-Id: I8e59bdaf2d0e4e08a659e08f63a14472fba72eb2 Signed-off-by: Alex Deiter Reviewed-on: https://review.whamcloud.com/47604 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- config/lustre-build-linux.m4 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index e8122fe..ef5ee24 100644 --- 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])], -- 1.8.3.1