X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build-linux.m4;h=e47efd85c78a0e4dd36df5288e09705cfae9e328;hb=0c5dd2c53ed8d6c85d176a6ac8fc24e29f92d428;hp=d92ab36e293aa3147c5cd1eaf0dfc9357fd6b5d2;hpb=c0ef5a16bd01fe82de0bff98eea7be7fc1d06daf;p=fs%2Flustre-release.git diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index d92ab36..e47efd8 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -98,9 +98,40 @@ AC_MSG_CHECKING([for Lustre release]) RELEASE="`echo ${LINUXRELEASE} | tr '-' '_'`_`date +%Y%m%d%H%M`" AC_MSG_RESULT($RELEASE) AC_SUBST(RELEASE) + +# check is redhat/suse kernels +AC_MSG_CHECKING([that RedHat kernel]) +LB_LINUX_TRY_COMPILE([ + #include + ],[ + #ifndef RHEL_MAJOR + #error "not redhat kernel" + #endif + ],[ + RHEL_KENEL="yes" + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_RESULT([no]) +]) + +AC_MSG_CHECKING([that SuSe kernel]) +LB_LINUX_TRY_COMPILE([ + #include + ],[ + #ifndef SLE_VERSION_CODE + #error "not sles kernel" + #endif + ],[ + SUSE_KERNEL="yes" + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_RESULT([no]) +]) + ]) # +# # LB_LINUX_PATH # # Find paths for linux, handling kernel-source rpms @@ -159,12 +190,6 @@ LB_CHECK_FILES([$LINUX_OBJ/include/linux/autoconf.h $LINUX_OBJ/include/linux/version.h ],[], [AC_MSG_ERROR([Run make config in $LINUX.])]) -# -LB_CHECK_FILE([$LINUX_OBJ/include/linux/config.h], - [ AC_DEFINE(HAVE_KERNEL_CONFIG_H, 1, - [kernel modules need to include config.h]) - ] -) # ------------ rhconfig.h includes runtime-generated bits -- # red hat kernel-source checks @@ -199,10 +224,48 @@ LB_LINUX_TRY_COMPILE([],[],[ AC_MSG_RESULT([no]) AC_MSG_WARN([Consult config.log for details.]) AC_MSG_WARN([If you are trying to build with a kernel-source rpm, consult build/README.kernel-source]) - AC_MSG_ERROR([Kernel modules cannot be build.]) + AC_MSG_ERROR([Kernel modules cannot be built.]) ]) LB_LINUX_RELEASE +]) # end of LB_LINUX_PATH + +# +# +# LB_LINUX_MODPOST +# +# Find modpost and check it +# +AC_DEFUN([LB_LINUX_MODPOST], +[ +# Find the modpost utility +LB_CHECK_FILE([$LINUX_OBJ/scripts/mod/modpost], + [MODPOST=$LINUX_OBJ/scripts/mod/modpost], + [LB_CHECK_FILE([$LINUX_OBJ/scripts/modpost], + [MODPOST=$LINUX_OBJ/scripts/modpost], + AC_MSG_ERROR([modpost not found.]) + )] +) +AC_SUBST(MODPOST) + +# Ensure it can run +AC_MSG_CHECKING([if modpost can be run]) +if $MODPOST ; then + AC_MSG_RESULT([yes]) +else + AC_MSG_ERROR([modpost can not be run.]) +fi + +# Check if modpost supports (and therefore requires) -m +AC_MSG_CHECKING([if modpost supports -m]) +if $MODPOST -m 2>/dev/null ; then + AC_MSG_RESULT([yes]) + MODPOST_ARGS=-m +else + AC_MSG_RESULT([no]) + MODPOST_ARGS="" +fi +AC_SUBST(MODPOST_ARGS) ]) # @@ -268,7 +331,7 @@ $2 AC_DEFUN([LB_LINUX_COMPILE_IFELSE], [m4_ifvaln([$1], [LB_LINUX_CONFTEST([$1])])dnl rm -f build/conftest.o build/conftest.mod.c build/conftest.ko -AS_IF([AC_TRY_COMMAND(cp conftest.c build && make [$2] CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -Iinclude -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], +AS_IF([AC_TRY_COMMAND(cp conftest.c build && make [$2] CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], [$4], [_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])dnl])dnl @@ -276,6 +339,21 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest. ]) # +# LB_LINUX_ARCH +# +# Determine the kernel's idea of the current architecture +# +AC_DEFUN([LB_LINUX_ARCH], + [AC_MSG_CHECKING([Linux kernel architecture]) + AS_IF([rm -f $PWD/build/arch + make -s --no-print-directory echoarch -f $PWD/build/Makefile \ + LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -C $LINUX_OBJ $ARCH_UM \ + ARCHFILE=$PWD/build/arch && LINUX_ARCH=`cat $PWD/build/arch`], + [AC_MSG_RESULT([$LINUX_ARCH])], + [AC_MSG_ERROR([Could not determine the kernel architecture.])]) + rm -f build/arch]) + +# # LB_LINUX_TRY_COMPILE # # like AC_TRY_COMPILE @@ -295,9 +373,7 @@ AC_DEFUN([LB_LINUX_TRY_COMPILE], AC_DEFUN([LB_LINUX_CONFIG], [AC_MSG_CHECKING([if Linux was built with CONFIG_$1]) LB_LINUX_TRY_COMPILE([ -#ifdef HAVE_KERNEL_CONFIG_H -#include -#endif +#include ],[ #ifndef CONFIG_$1 #error CONFIG_$1 not #defined @@ -318,7 +394,9 @@ $3 # AC_DEFUN([LB_LINUX_CONFIG_IM], [AC_MSG_CHECKING([if Linux was built with CONFIG_$1 in or as module]) -LB_LINUX_TRY_COMPILE([#include ],[ +LB_LINUX_TRY_COMPILE([ +#include +],[ #if !(defined(CONFIG_$1) || defined(CONFIG_$1_MODULE)) #error CONFIG_$1 and CONFIG_$1_MODULE not #defined #endif @@ -367,6 +445,11 @@ fi # AC_DEFUN([LB_PROG_LINUX], [LB_LINUX_PATH +LB_LINUX_ARCH + +if test $LINUX_ARCH == "powerpc64"; then + CFLAGS="$CFLAGS -m64" +fi LB_LINUX_CONFIG([MODULES],[],[ AC_MSG_ERROR([module support is required to build Lustre kernel modules.])