Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-14362 tests: sanity-flr to prepare stuff before checks
[fs/lustre-release.git]
/
config
/
lustre-build-linux.m4
diff --git
a/config/lustre-build-linux.m4
b/config/lustre-build-linux.m4
index
832bd15
..
f39b010
100644
(file)
--- a/
config/lustre-build-linux.m4
+++ b/
config/lustre-build-linux.m4
@@
-29,14
+29,23
@@
AC_CACHE_CHECK([for external module build target], lb_cv_module_target,
[$makerule LUSTRE_KERNEL_TEST=conftest.i],
[test -s build/conftest.i],
[lb_cv_module_target="M"], [
[$makerule LUSTRE_KERNEL_TEST=conftest.i],
[test -s build/conftest.i],
[lb_cv_module_target="M"], [
+ MODULE_TARGET="M"
+ makerule=""
+ LB_LINUX_TRY_MAKE([], [],
+ [$makerule LUSTRE_KERNEL_TEST=conftest.i],
+ [test -s build/conftest.i],
+ [lb_cv_module_target="M58"], [
AC_MSG_ERROR([kernel module make failed; check config.log for details])
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])],
[test "x$lb_cv_module_target" = "xM54"],
[makerule="$PWD/build"
lb_cv_module_target="M"],
])
AS_IF([test -z "$lb_cv_module_target"],
[AC_MSG_ERROR([unknown external module build target])],
[test "x$lb_cv_module_target" = "xM54"],
[makerule="$PWD/build"
lb_cv_module_target="M"],
+[test "x$lb_cv_module_target" = "xM58"],
+ [makerule=""
+ lb_cv_module_target="M"],
[test "x$lb_cv_module_target" = "xM"],
[makerule="_module_$PWD/build"])
MODULE_TARGET=$lb_cv_module_target
[test "x$lb_cv_module_target" = "xM"],
[makerule="_module_$PWD/build"])
MODULE_TARGET=$lb_cv_module_target
@@
-580,7
+589,7
@@
AC_DEFUN([LB_LINUX_COMPILE_IFELSE],
[m4_ifvaln([$1], [AC_LANG_CONFTEST([AC_LANG_SOURCE([$1])])])dnl
rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
SUBARCH=$(echo $target_cpu | sed -e 's/powerpc.*/powerpc/' -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/' -e 's/k1om/x86/' -e 's/aarch64.*/arm64/' -e 's/armv7.*/arm/')
[m4_ifvaln([$1], [AC_LANG_CONFTEST([AC_LANG_SOURCE([$1])])])dnl
rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
SUBARCH=$(echo $target_cpu | sed -e 's/powerpc.*/powerpc/' -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/' -e 's/k1om/x86/' -e 's/aarch64.*/arm64/' -e 's/armv7.*/arm/')
-AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] LDFLAGS= ${LD:+LD="$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_CHECK_INCLUDE -I$LINUX/arch/$SUBARCH/include -Iinclude -Iarch/$SUBARCH/include/generated -I$LINUX/include -Iinclude2 -I$LINUX/include/uapi -Iinclude/generated -I$LINUX/arch/$SUBARCH/include/uapi -Iarch/$SUBARCH/include/generated/uapi -I$LINUX/include/uapi -Iinclude/generated/uapi ${SPL_OBJ:+-include $SPL_OBJ/spl_config.h} ${ZFS_OBJ:+-include $ZFS_OBJ/zfs_config.h} ${SPL:+-I$SPL/include } ${ZFS:+-I$ZFS -I$ZFS/include -I${SPL:-$ZFS/include/spl}} -include $CONFIG_INCLUDE" KBUILD_EXTRA_SYMBOLS=
${ZFS_OBJ:+$ZFS_OBJ/Module.symvers}
-o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
+AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] LDFLAGS= ${LD:+LD="$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_CHECK_INCLUDE -I$LINUX/arch/$SUBARCH/include -Iinclude -Iarch/$SUBARCH/include/generated -I$LINUX/include -Iinclude2 -I$LINUX/include/uapi -Iinclude/generated -I$LINUX/arch/$SUBARCH/include/uapi -Iarch/$SUBARCH/include/generated/uapi -I$LINUX/include/uapi -Iinclude/generated/uapi ${SPL_OBJ:+-include $SPL_OBJ/spl_config.h} ${ZFS_OBJ:+-include $ZFS_OBJ/zfs_config.h} ${SPL:+-I$SPL/include } ${ZFS:+-I$ZFS -I$ZFS/include -I${SPL:-$ZFS/include/spl}} -include $CONFIG_INCLUDE" KBUILD_EXTRA_SYMBOLS=
"${ZFS_OBJ:+$ZFS_OBJ/Module.symvers} $KBUILD_EXTRA_SYMBOLS"
-o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
[$4],
[_AC_MSG_LOG_CONFTEST
m4_ifvaln([$5],[$5])dnl])
[$4],
[_AC_MSG_LOG_CONFTEST
m4_ifvaln([$5],[$5])dnl])
@@
-803,8
+812,8
@@
AC_DEFUN([LB2_LINUX_TEST_COMPILE_ALL], [
# source is generated.
#
AC_DEFUN([LB2_LINUX_TEST_SRC], [
# source is generated.
#
AC_DEFUN([LB2_LINUX_TEST_SRC], [
- LB2_LINUX_CONFTEST_C([LB_LANG_PROGRAM([[$2]], [[$3]])], [$1])
- LB2_LINUX_CONFTEST_MAKEFILE([$1], [$4], [$5])
+ LB2_LINUX_CONFTEST_C([LB_LANG_PROGRAM([[$2]], [[$3]])], [$1
_pc
])
+ LB2_LINUX_CONFTEST_MAKEFILE([$1
_pc
], [$4], [$5])
])
#
])
#
@@
-815,8
+824,8
@@
AC_DEFUN([LB2_LINUX_TEST_SRC], [
# $3 - run on failure (unable to compile)
#
AC_DEFUN([LB2_LINUX_TEST_RESULT], [
# $3 - run on failure (unable to compile)
#
AC_DEFUN([LB2_LINUX_TEST_RESULT], [
- AS_IF([test -d ${TEST_DIR}/$1], [
- AS_IF([test -f ${TEST_DIR}/$1
/$1
.ko], [$2], [$3])
+ AS_IF([test -d ${TEST_DIR}/$1
_pc
], [
+ AS_IF([test -f ${TEST_DIR}/$1
_pc/$1_pc
.ko], [$2], [$3])
], [
AC_MSG_ERROR([
*** No matching source for the "$1" test, check that
], [
AC_MSG_ERROR([
*** No matching source for the "$1" test, check that