X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build-linux.m4;h=e0eafbdef310270107fe94126b03749d7d52c0b6;hp=ac337a9404100a4d62d13cdab58046b3b24ac090;hb=fcfdd2277f8919dc5b8974c13daf73bc19aa279a;hpb=09ef6990252b7958c3fce039eefdb88d93ab27f7 diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index ac337a9..e0eafbd 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 @@ -110,7 +141,13 @@ AC_DEFUN([LB_LINUX_PATH], AC_ARG_WITH([linux], AC_HELP_STRING([--with-linux=path], [set path to Linux source (default=/usr/src/linux)]), - [LINUX=$with_linux], + [ + if ! [[[ $with_linux = /* ]]]; then + AC_MSG_ERROR([You must provide an absolute pathname to the --with-linux= option.]) + else + LINUX=$with_linux + fi + ], [LINUX=/usr/src/linux]) AC_MSG_RESULT([$LINUX]) AC_SUBST(LINUX) @@ -152,9 +189,12 @@ 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])]) # ----------- make dep run? ------------------ +# at 2.6.19 # $LINUX/include/linux/config.h is removed +# and at more old has only one line +# include LB_CHECK_FILES([$LINUX_OBJ/include/linux/autoconf.h $LINUX_OBJ/include/linux/version.h - $LINUX/include/linux/config.h],[], + ],[], [AC_MSG_ERROR([Run make config in $LINUX.])]) # ------------ rhconfig.h includes runtime-generated bits -- @@ -190,10 +230,62 @@ 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_SYMVERFILE +# SLES 9 uses a different name for this file - unsure about vanilla kernels +# around this version, but it matters for servers only. +AC_DEFUN([LB_LINUX_SYMVERFILE], + [AC_MSG_CHECKING([name of module symbol version file]) + if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost ; then + SYMVERFILE=Modules.symvers + else + SYMVERFILE=Module.symvers + fi + AC_MSG_RESULT($SYMVERFILE) + AC_SUBST(SYMVERFILE) +]) + +# +# +# 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) ]) # @@ -213,7 +305,7 @@ if test -e $LINUX/include/asm-um ; then UML_CFLAGS='-O0' AC_MSG_RESULT(yes) else - AC_MSG_RESULT([no (asm doesn't point at asm-um)]) + AC_MSG_RESULT([no]) fi else AC_MSG_RESULT([no (asm-um missing)]) @@ -236,6 +328,21 @@ $1 _ACEOF ]) + +# LB_LANG_PROGRAM(C)([PROLOGUE], [BODY]) +# -------------------------------------- +m4_define([LB_LANG_PROGRAM], +[$1 +int +main (void) +{ +dnl Do *not* indent the following line: there may be CPP directives. +dnl Don't move the `;' right after for the same reason. +$2 + ; + return 0; +}]) + # # LB_LINUX_COMPILE_IFELSE # @@ -244,7 +351,7 @@ _ACEOF 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 -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 -d [$2] ${LD:+"LD=$LD"} 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 @@ -252,13 +359,28 @@ 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 # AC_DEFUN([LB_LINUX_TRY_COMPILE], [LB_LINUX_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[$1]], [[$2]])], + [AC_LANG_SOURCE([LB_LANG_PROGRAM([[$1]], [[$2]])])], [modules], [test -s build/conftest.o], [$3], [$4])]) @@ -270,7 +392,9 @@ 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([#include ],[ +LB_LINUX_TRY_COMPILE([ +#include +],[ #ifndef CONFIG_$1 #error CONFIG_$1 not #defined #endif @@ -290,7 +414,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 @@ -309,7 +435,7 @@ $3 # like LB_LINUX_TRY_COMPILE, but with different arguments # AC_DEFUN([LB_LINUX_TRY_MAKE], -[LB_LINUX_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4], [$5], [$6])]) +[LB_LINUX_COMPILE_IFELSE([AC_LANG_SOURCE([LB_LANG_PROGRAM([[$1]], [[$2]])])], [$3], [$4], [$5], [$6])]) # # LB_LINUX_CONFIG_BIG_STACK @@ -339,6 +465,9 @@ fi # AC_DEFUN([LB_PROG_LINUX], [LB_LINUX_PATH +LB_LINUX_ARCH +LB_LINUX_SYMVERFILE + LB_LINUX_CONFIG([MODULES],[],[ AC_MSG_ERROR([module support is required to build Lustre kernel modules.]) @@ -362,33 +491,8 @@ LB_LINUX_CONFIG([KMOD],[],[ AC_MSG_WARN([]) ]) -# -# following CRYPTO related are required by capability -# -LB_LINUX_CONFIG_IM([CRYPTO],[],[ - AC_MSG_ERROR([Lustre require that CONFIG_CRYPTO is enabled in your kernel.]) -]) - -LB_LINUX_CONFIG_IM([CRYPTO_HMAC],[],[ - AC_MSG_ERROR([Lustre require that CONFIG_CRYPTO_HMAC is enabled in your kernel.]) -]) - -LB_LINUX_CONFIG_IM([CRYPTO_SHA1],[],[ - AC_MSG_ERROR([Lustre require that CONFIG_CRYPTO_SHA1 is enabled in your kernel.]) -]) - #LB_LINUX_CONFIG_BIG_STACK -# LNet tests -LN_PROG_LINUX - -# Lustre tests -LC_PROG_LINUX - -# Portals tests -if test "$PORTALS" ; then - LP_PROG_LINUX -fi ]) # @@ -398,54 +502,42 @@ fi # AC_DEFUN([LB_LINUX_CONDITIONALS], [AM_CONDITIONAL(LINUX25, test x$linux25 = xyes) -AM_CONDITIONAL(GSS, test x$enable_gss = xyes) ]) -# -# LC_LINUX_CONFIG_GSS -# -# Build gss and related tools of Lustre. Currently both kernel and user space -# parts are depend on linux platform. -# -AC_DEFUN([LC_LINUX_CONFIG_GSS], -[AC_MSG_CHECKING([whether to enable gss/krb5 support]) -AC_ARG_ENABLE([gss], - AC_HELP_STRING([--enable-gss], [enable gss/krb5 support]), - [],[enable_gss='no']) -AC_MSG_RESULT([$enable_gss]) -if test x$enable_gss == xyes; then - LB_LINUX_CONFIG_IM([SUNRPC],[],[ - AC_MSG_ERROR([GSS require that CONFIG_SUNRPC is enabled in your kernel.]) - ]) - LB_LINUX_CONFIG_IM([CRYPTO_DES],[],[ - AC_MSG_WARN([DES support is recommended by using GSS.]) - ]) - LB_LINUX_CONFIG_IM([CRYPTO_MD5],[],[ - AC_MSG_WARN([MD5 support is recommended by using GSS.]) - ]) - LB_LINUX_CONFIG_IM([CRYPTO_SHA256],[],[ - AC_MSG_WARN([SHA256 support is recommended by using GSS.]) - ]) - LB_LINUX_CONFIG_IM([CRYPTO_SHA512],[],[ - AC_MSG_WARN([SHA512 support is recommended by using GSS.]) - ]) - LB_LINUX_CONFIG_IM([CRYPTO_ARC4],[],[ - AC_MSG_WARN([ARC4 support is recommended by using GSS.]) - ]) - # - # unfortunately AES symbol is depend (optimized) on arch - # - - AC_CHECK_LIB(gssapi, gss_init_sec_context, [ - GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi" - ], [ - AC_MSG_ERROR([libgssapi is not found, consider --disable-gss.]) - ], - ) - - AC_SUBST(GSSAPI_LIBS) - AC_KERBEROS_V5 +# +# LB_CHECK_SYMBOL_EXPORT +# check symbol exported or not +# $1 - symbol +# $2 - file(s) for find. +# $3 - do 'yes' +# $4 - do 'no' +# +# 2.6 based kernels - put modversion info into $LINUX/Module.modvers +# or check +AC_DEFUN([LB_CHECK_SYMBOL_EXPORT], +[AC_MSG_CHECKING([if Linux was built with symbol $1 is exported]) +grep -q -E '[[[:space:]]]$1[[[:space:]]]' $LINUX/$SYMVERFILE 2>/dev/null +rc=$? +if test $rc -ne 0; then + export=0 + for file in $2; do + grep -q -E "EXPORT_SYMBOL.*\($1\)" "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then + AC_MSG_RESULT([no]) + $4 + else + AC_MSG_RESULT([yes]) + $3 + fi +else + AC_MSG_RESULT([yes]) + $3 fi ]) -