From bd301e8c9f322ae22070cc76bce96266168407ad Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Fri, 23 Nov 2012 22:04:32 -0800 Subject: [PATCH] LU-1199 build: Remove obsolete check for 2.4 kernels Remove check for 2.4 kernels, which are no longer supported. Change-Id: I4ed5b7c2686fa9b0c104444853e45900f90e1eb8 Signed-off-by: Christopher J. Morrone Reviewed-on: http://review.whamcloud.com/4679 Tested-by: Hudson Reviewed-by: Andreas Dilger Reviewed-by: Brian J. Murrell Tested-by: Maloo --- build/autoMakefile.am.toplevel | 13 ------ build/autoconf/lustre-build-linux.m4 | 91 +++++++++--------------------------- build/autoconf/lustre-build.m4 | 3 +- ldiskfs/configure.ac | 3 -- libcfs/libcfs/Makefile.in | 10 ---- 5 files changed, 23 insertions(+), 97 deletions(-) diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel index 297fa4f..d42dc92 100644 --- a/build/autoMakefile.am.toplevel +++ b/build/autoMakefile.am.toplevel @@ -68,19 +68,6 @@ all-sources: $(MODULE_SYMVERS_DEPS) if LINUX all-am: modules -if !LINUX25 -DEP = dep -dep: .depend - -.depend: all-sources - $(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ) \ - -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \ - -o scripts -o include/config/MARKER _sfdep_$(PWD) \ - _FASTDEP_ALL_SUB_DIRS="$(PWD)" - -CLEANFILES = .depend -endif # !LINUX25 - modules: $(DEP) all-sources $(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ) \ -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \ diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index d933e26..0ea5b1a 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -1,48 +1,34 @@ # # LB_LINUX_VERSION # -# Set things accordingly for a 2.5 kernel +# Set things accordingly for a linux kernel # -AC_DEFUN([LB_LINUX_VERSION], -[LB_CHECK_FILE([$LINUX/include/linux/namei.h], +AC_DEFUN([LB_LINUX_VERSION],[ +KMODEXT=".ko" + +MODULE_TARGET="SUBDIRS" +makerule="$PWD/build" +AC_MSG_CHECKING([for external module build support]) +rm -f build/conftest.i +LB_LINUX_TRY_MAKE([],[], + [$makerule LUSTRE_KERNEL_TEST=conftest.i], + [test -s build/conftest.i], [ - linux25="yes" - KMODEXT=".ko" + AC_MSG_RESULT([no]) ],[ - KMODEXT=".o" - linux25="no" + makerule="_module_$makerule" + MODULE_TARGET="M" + LB_LINUX_TRY_MAKE([],[], + [$makerule LUSTRE_KERNEL_TEST=conftest.i], + [test -s build/conftest.i], + [ + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_ERROR([unknown; check config.log for details]) + ]) ]) -AC_MSG_CHECKING([if you are using Linux 2.6]) -AC_MSG_RESULT([$linux25]) - -MODULE_TARGET="SUBDIRS" -if test $linux25 = "yes" ; then - makerule="$PWD/build" - AC_MSG_CHECKING([for external module build support]) - rm -f build/conftest.i - LB_LINUX_TRY_MAKE([],[], - [$makerule LUSTRE_KERNEL_TEST=conftest.i], - [test -s build/conftest.i], - [ - AC_MSG_RESULT([no]) - ],[ - makerule="_module_$makerule" - MODULE_TARGET="M" - LB_LINUX_TRY_MAKE([],[], - [$makerule LUSTRE_KERNEL_TEST=conftest.i], - [test -s build/conftest.i], - [ - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_ERROR([unknown; check config.log for details]) - ]) - ]) -else - makerule="_dir_$PWD/build" -fi AC_SUBST(MODULE_TARGET) -AC_SUBST(linux25) AC_SUBST(KMODEXT) ]) @@ -482,27 +468,6 @@ AC_DEFUN([LB_LINUX_TRY_MAKE], ) # -# LB_LINUX_CONFIG_BIG_STACK -# -# check for big stack patch -# -AC_DEFUN([LB_LINUX_CONFIG_BIG_STACK], -[if test "x$ARCH_UM" = "x" -a "x$linux25" = "xno" ; then - case $target_cpu in - i?86 | x86_64) - LB_LINUX_CONFIG([STACK_SIZE_16KB],[],[ - LB_LINUX_CONFIG([STACK_SIZE_32KB],[],[ - LB_LINUX_CONFIG([STACK_SIZE_64KB],[],[ - AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 16KB stack.]) - ]) - ]) - ]) - ;; - esac -fi -]) - -# # LB_CONFIG_OFED_BACKPORTS # # include any OFED backport headers in all compile commands @@ -622,8 +587,6 @@ fi # 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 @@ -631,16 +594,6 @@ LB_CONFIG_OFED_BACKPORTS ]) # -# LB_LINUX_CONDITIONALS -# -# AM_CONDITIONALS for linux -# -AC_DEFUN([LB_LINUX_CONDITIONALS], -[AM_CONDITIONAL(LINUX25, test x$linux25 = xyes) -]) - - -# # LB_CHECK_SYMBOL_EXPORT # check symbol exported or not # $1 - symbol diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4 index a851d08..d977558 100644 --- a/build/autoconf/lustre-build.m4 +++ b/build/autoconf/lustre-build.m4 @@ -370,7 +370,7 @@ case x$with_dmu in dmu_osd='yes' else # Enable the DMU by default on the b_hd_kdmu branch - if test -d $PWD/zfs -a x$linux25$enable_server = xyesyes; then + if test -d $PWD/zfs -a x$enable_server = xyes; then dmu_osd='yes' else dmu_osd='no' @@ -713,7 +713,6 @@ fi AC_SUBST(LIBSYSIO_SUBDIR) AC_SUBST(SYSIO) -LB_LINUX_CONDITIONALS LB_DARWIN_CONDITIONALS LIBCFS_CONDITIONALS diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac index 9176673..5f3a1ec 100644 --- a/ldiskfs/configure.ac +++ b/ldiskfs/configure.ac @@ -56,10 +56,8 @@ AC_MSG_RESULT([$enable_modules]) if test x$enable_modules = xyes ; then LB_PROG_LINUX -if test x$linux25 = xyes ; then LB_LINUX_MODPOST fi -fi LB_LDISKFS_SERIES([test x$enable_dist = xno]) @@ -82,7 +80,6 @@ LB_CONFIG_HEADERS AM_CONDITIONAL(MODULES, true) AM_CONDITIONAL(LINUX, true) AM_CONDITIONAL(DARWIN, true) -AM_CONDITIONAL(LINUX25, true) LDISKFSDIR="$PWD/ldiskfs" AC_SUBST(LDISKFSDIR) diff --git a/libcfs/libcfs/Makefile.in b/libcfs/libcfs/Makefile.in index c9cff92..4ad5b82 100644 --- a/libcfs/libcfs/Makefile.in +++ b/libcfs/libcfs/Makefile.in @@ -25,20 +25,10 @@ endif default: all -ifeq (@linux25@,no) -sources: - @for i in $(libcfs-linux-objs:%.o=%.c) ; do \ - echo "ln -s @srcdir@/linux/$$i ." ; \ - ln -sf @srcdir@/linux/$$i . || exit 1 ; \ - done - -else sources: libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs)) -endif - libcfs-all-objs := debug.o fail.o nidstrings.o lwt.o module.o tracefile.o \ watchdog.o libcfs_string.o hash.o kernel_user_comm.o \ prng.o workitem.o upcall_cache.o libcfs_cpu.o \ -- 1.8.3.1