X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build-linux.m4;h=8a10dbfc0e7567d0df975d9446f294863dd26a81;hb=5bde66389c386616133cf382b8f5b00317482670;hp=193c6c7b9aa033bbc45e2816e21c368c63f03254;hpb=f06c170a4e95d3ae0c724108560355cc6500b437;p=fs%2Flustre-release.git diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index 193c6c7..8a10dbf 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -84,7 +84,7 @@ fi AC_MSG_RESULT([$LINUXRELEASE]) AC_SUBST(LINUXRELEASE) -moduledir='/lib/modules/'$LINUXRELEASE/kernel +moduledir='/lib/modules/'$LINUXRELEASE/updates/kernel AC_SUBST(moduledir) modulefsdir='$(moduledir)/fs/$(PACKAGE)' @@ -95,7 +95,15 @@ AC_SUBST(modulenetdir) # ------------ RELEASE -------------------------------- AC_MSG_CHECKING([for Lustre release]) -RELEASE="`echo ${LINUXRELEASE} | tr '-' '_'`_`date +%Y%m%d%H%M`" +AC_ARG_WITH([release], + AC_HELP_STRING([--with-release=string], + [set the release string (default=$kvers_YYYYMMDDhhmm)]), + [RELEASE=$withval], + RELEASE="" + if test -n "$DOWNSTREAM_RELEASE"; then + RELEASE="${DOWNSTREAM_RELEASE}_" + fi + RELEASE="$RELEASE`echo ${LINUXRELEASE} | tr '-' '_'`_$BUILDID") AC_MSG_RESULT($RELEASE) AC_SUBST(RELEASE) @@ -104,30 +112,52 @@ AC_MSG_CHECKING([that RedHat kernel]) LB_LINUX_TRY_COMPILE([ #include ],[ - #ifndef RHEL_MAJOR + #ifndef RHEL_RELEASE_CODE #error "not redhat kernel" #endif ],[ RHEL_KENEL="yes" + RHEL_KERNEL="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_CONFIG([SUSE_KERNEL],[SUSE_KERNEL="yes"],[]) + +]) + +# LB_ARG_REPLACE_PATH(PACKAGE, PATH) +AC_DEFUN([LB_ARG_REPLACE_PATH],[ + new_configure_args= + eval "set x $ac_configure_args" + shift + for arg; do + case $arg in + --with-[$1]=*) + arg=--with-[$1]=[$2] + ;; + *\'*) + arg=$(printf %s\n ["$arg"] | \ + sed "s/'/'\\\\\\\\''/g") + ;; + esac + dnl AS_VAR_APPEND([new_configure_args], [" '$arg'"]) + new_configure_args="$new_configure_args \"$arg\"" + done + ac_configure_args=$new_configure_args +]) + +# this is the work-horse of the next function +AC_DEFUN([__LB_ARG_CANON_PATH], [ + [$3]=$(readlink -f $with_$2) + LB_ARG_REPLACE_PATH([$1], $[$3]) ]) +# a front-end for the above function that transforms - and . in the +# PACKAGE portion of --with-PACKAGE into _ suitable for variable names +AC_DEFUN([LB_ARG_CANON_PATH], [ + __LB_ARG_CANON_PATH([$1], m4_translit([$1], [-.], [__]), [$2]) ]) # @@ -137,12 +167,28 @@ LB_LINUX_TRY_COMPILE([ # Find paths for linux, handling kernel-source rpms # AC_DEFUN([LB_LINUX_PATH], -[AC_MSG_CHECKING([for Linux sources]) +[# prep some default values +for DEFAULT_LINUX in /lib/modules/$(uname -r)/{source,build} /usr/src/linux; do + if readlink -q -e $DEFAULT_LINUX; then + break + fi +done +if test "$DEFAULT_LINUX" = "/lib/modules/$(uname -r)/source"; then + PATHS="/lib/modules/$(uname -r)/build" +fi +PATHS+=" $DEFAULT_LINUX" +for DEFAULT_LINUX_OBJ in $PATHS; do + if readlink -q -e $DEFAULT_LINUX_OBJ; then + break + fi +done +AC_MSG_CHECKING([for Linux sources]) AC_ARG_WITH([linux], AC_HELP_STRING([--with-linux=path], - [set path to Linux source (default=/usr/src/linux)]), - [LINUX=$with_linux], - [LINUX=/usr/src/linux]) + [set path to Linux source (default=/lib/modules/$(uname -r)/{source,build},/usr/src/linux)]), + [LB_ARG_CANON_PATH([linux], [LINUX]) + DEFAULT_LINUX_OBJ=$LINUX], + [LINUX=$DEFAULT_LINUX]) AC_MSG_RESULT([$LINUX]) AC_SUBST(LINUX) @@ -154,9 +200,10 @@ LB_CHECK_FILE([$LINUX],[], AC_MSG_CHECKING([for Linux objects dir]) AC_ARG_WITH([linux-obj], AC_HELP_STRING([--with-linux-obj=path], - [set path to Linux objects dir (default=$LINUX)]), - [LINUX_OBJ=$with_linux_obj], - [LINUX_OBJ=$LINUX]) + [set path to Linux objects dir (default=/lib/modules/$(uname -r)/build,/usr/src/linux)]), + [LB_ARG_CANON_PATH([linux-obj], [LINUX_OBJ])], + [LINUX_OBJ=$DEFAULT_LINUX_OBJ]) + AC_MSG_RESULT([$LINUX_OBJ]) AC_SUBST(LINUX_OBJ) @@ -164,7 +211,7 @@ AC_SUBST(LINUX_OBJ) AC_ARG_WITH([linux-config], [AC_HELP_STRING([--with-linux-config=path], [set path to Linux .conf (default=$LINUX_OBJ/.config)])], - [LINUX_CONFIG=$with_linux_config], + [LB_ARG_CANON_PATH([linux-config], [LINUX_CONFIG])], [LINUX_CONFIG=$LINUX_OBJ/.config]) AC_SUBST(LINUX_CONFIG) @@ -176,7 +223,7 @@ LB_CHECK_FILE([/boot/kernel.h], AC_ARG_WITH([kernel-source-header], AC_HELP_STRING([--with-kernel-source-header=path], [Use a different kernel version header. Consult build/README.kernel-source for details.]), - [KERNEL_SOURCE_HEADER=$with_kernel_source_header]) + [LB_ARG_CANON_PATH([kernel-source-header], [KERNEL_SOURCE_HEADER])]) # ------------ .config exists ---------------- LB_CHECK_FILE([$LINUX_CONFIG],[], @@ -186,9 +233,9 @@ LB_CHECK_FILE([$LINUX_CONFIG],[], # 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 - ],[], +LB_CHECK_FILE([$LINUX_OBJ/include/linux/autoconf.h],[], + [AC_MSG_ERROR([Run make config in $LINUX.])]) +LB_CHECK_FILE([$LINUX_OBJ/include/linux/version.h],[], [AC_MSG_ERROR([Run make config in $LINUX.])]) # ------------ rhconfig.h includes runtime-generated bits -- @@ -230,6 +277,20 @@ LB_LINUX_TRY_COMPILE([],[],[ 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 @@ -285,7 +346,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)]) @@ -297,18 +358,6 @@ AC_SUBST(UML_CFLAGS) # these are like AC_TRY_COMPILE, but try to build modules against the # kernel, inside the build directory -# -# LB_LINUX_CONFTEST -# -# create a conftest.c file -# -AC_DEFUN([LB_LINUX_CONFTEST], -[cat >conftest.c <<_ACEOF -$1 -_ACEOF -]) - - # LB_LANG_PROGRAM(C)([PROLOGUE], [BODY]) # -------------------------------------- m4_define([LB_LANG_PROGRAM], @@ -329,12 +378,12 @@ $2 # like AC_COMPILE_IFELSE # AC_DEFUN([LB_LINUX_COMPILE_IFELSE], -[m4_ifvaln([$1], [LB_LINUX_CONFTEST([$1])])dnl +[m4_ifvaln([$1], [AC_LANG_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 -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])], +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/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX_OBJ/include -I$LINUX/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 +m4_ifvaln([$5],[$5])dnl]) rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl ]) @@ -347,7 +396,7 @@ 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 \ + LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -C $LINUX $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.])]) @@ -439,12 +488,132 @@ fi ]) # +# LB_CONFIG_OFED_BACKPORTS +# +# include any OFED backport headers in all compile commands +# NOTE: this does only include the backport paths, not the OFED headers +# adding the OFED headers is done in the lnet portion +AC_DEFUN([LB_CONFIG_OFED_BACKPORTS], +[AC_MSG_CHECKING([whether to use any OFED backport headers]) +# set default +AC_ARG_WITH([o2ib], + AC_HELP_STRING([--with-o2ib=path], + [build o2iblnd against path]), + [ + case $with_o2ib in + yes) O2IBPATHS="$LINUX $LINUX/drivers/infiniband" + ENABLEO2IB=2 + ;; + no) ENABLEO2IB=0 + ;; + *) O2IBPATHS=$with_o2ib + ENABLEO2IB=3 + ;; + esac + ],[ + O2IBPATHS="$LINUX $LINUX/drivers/infiniband" + ENABLEO2IB=1 + ]) +if test $ENABLEO2IB -eq 0; then + AC_MSG_RESULT([no]) +else + o2ib_found=false + for O2IBPATH in $O2IBPATHS; do + if test \( -f ${O2IBPATH}/include/rdma/rdma_cm.h -a \ + -f ${O2IBPATH}/include/rdma/ib_cm.h -a \ + -f ${O2IBPATH}/include/rdma/ib_verbs.h -a \ + -f ${O2IBPATH}/include/rdma/ib_fmr_pool.h \); then + o2ib_found=true + break + fi + done + if ! $o2ib_found; then + AC_MSG_RESULT([no]) + case $ENABLEO2IB in + 1) ;; + 2) AC_MSG_ERROR([kernel OpenIB gen2 headers not present]);; + 3) AC_MSG_ERROR([bad --with-o2ib path]);; + *) AC_MSG_ERROR([internal error]);; + esac + else + if test -f $O2IBPATH/config.mk; then + . $O2IBPATH/config.mk + elif test -f $O2IBPATH/ofed_patch.mk; then + . $O2IBPATH/ofed_patch.mk + fi + if test -n "$BACKPORT_INCLUDES"; then + OFED_BACKPORT_PATH="$O2IBPATH/${BACKPORT_INCLUDES/*\/kernel_addons/kernel_addons}/" + EXTRA_LNET_INCLUDE="-I$OFED_BACKPORT_PATH $EXTRA_LNET_INCLUDE" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi +fi +]) + +# LC_MODULE_LOADING +# after 2.6.28 CONFIG_KMOD is removed, and only CONFIG_MODULES remains +# so we test if request_module is implemented or not +AC_DEFUN([LC_MODULE_LOADING], +[AC_MSG_CHECKING([if kernel module loading is possible]) +LB_LINUX_TRY_MAKE([ + #include +],[ + int myretval=ENOSYS ; + return myretval; +],[ + $makerule LUSTRE_KERNEL_TEST=conftest.i +],[ + grep request_module build/conftest.i | grep -v `grep "int myretval=" build/conftest.i | cut -d= -f2 | cut -d" " -f1` >/dev/null +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_MODULE_LOADING_SUPPORT, 1, + [kernel module loading is possible]) +],[ + AC_MSG_RESULT(no) + AC_MSG_WARN([]) + AC_MSG_WARN([Kernel module loading support is highly recommended.]) + AC_MSG_WARN([]) +]) +]) + +# LC_MODULE_LOADING +# after 2.6.28 CONFIG_KMOD is removed, and only CONFIG_MODULES remains +# so we test if request_module is implemented or not +AC_DEFUN([LC_MODULE_LOADING], +[AC_MSG_CHECKING([if kernel module loading is possible]) +LB_LINUX_TRY_MAKE([ + #include +],[ + int myretval=ENOSYS ; + return myretval; +],[ + $makerule LUSTRE_KERNEL_TEST=conftest.i +],[ + grep request_module build/conftest.i | grep -v `grep "int myretval=" build/conftest.i | cut -d= -f2 | cut -d" " -f1` >/dev/null +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_MODULE_LOADING_SUPPORT, 1, + [kernel module loading is possible]) +],[ + AC_MSG_RESULT(no) + AC_MSG_WARN([]) + AC_MSG_WARN([Kernel module loading support is highly recommended.]) + AC_MSG_WARN([]) +]) +]) + +# # LB_PROG_LINUX # # linux tests # 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.]) @@ -452,24 +621,21 @@ LB_LINUX_CONFIG([MODULES],[],[ LB_LINUX_CONFIG([MODVERSIONS]) -LB_LINUX_CONFIG([PREEMPT],[ - AC_MSG_ERROR([Lustre does not support kernels with preempt enabled.]) -]) - LB_LINUX_CONFIG([KALLSYMS],[],[ if test "x$ARCH_UM" = "x" ; then AC_MSG_ERROR([Lustre requires that CONFIG_KALLSYMS is enabled in your kernel.]) fi ]) -LB_LINUX_CONFIG([KMOD],[],[ - AC_MSG_WARN([]) - AC_MSG_WARN([Kernel module loading support is highly recommended.]) - AC_MSG_WARN([]) -]) +# 2.6.28 +LC_MODULE_LOADING #LB_LINUX_CONFIG_BIG_STACK +# it's ugly to be doing anything with OFED outside of the lnet module, but +# this has to be done here so that the backports path is set before all of +# the LN_PROG_LINUX checks are done +LB_CONFIG_OFED_BACKPORTS ]) # @@ -484,22 +650,22 @@ AC_DEFUN([LB_LINUX_CONDITIONALS], # # LB_CHECK_SYMBOL_EXPORT -# check symbol exported or not +# 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 +# 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/Module.symvers 2>/dev/null +[AC_MSG_CHECKING([if Linux was built with symbol $1 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 + grep -q -E "EXPORT_SYMBOL.*\($1\)" "$LINUX/$file" 2>/dev/null rc=$? if test $rc -eq 0; then export=1 @@ -518,3 +684,18 @@ else $3 fi ]) + +# +# Like AC_CHECK_HEADER but checks for a kernel-space header +# +m4_define([LB_CHECK_LINUX_HEADER], +[AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl +AC_CACHE_CHECK([for $1], ac_Header, + [LB_LINUX_COMPILE_IFELSE([LB_LANG_PROGRAM([@%:@include <$1>])], + [modules], + [test -s build/conftest.o], + [AS_VAR_SET(ac_Header, [yes])], + [AS_VAR_SET(ac_Header, [no])])]) +AS_IF([test AS_VAR_GET(ac_Header) = yes], [$2], [$3])[]dnl +AS_VAR_POPDEF([ac_Header])dnl +])