From c0ef5a16bd01fe82de0bff98eea7be7fc1d06daf Mon Sep 17 00:00:00 2001 From: scjody <scjody> Date: Mon, 23 Jul 2007 23:23:01 +0000 Subject: [PATCH] Branch b1_6 Revert this change since it caused build failures. b=12842 --- build/autoconf/lustre-build-linux.m4 | 12 ++---------- ldiskfs/ldiskfs/autoMakefile.am | 8 -------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index d38eb1d403..d92ab36e29 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -100,7 +100,6 @@ AC_MSG_RESULT($RELEASE) AC_SUBST(RELEASE) ]) -# # # LB_LINUX_PATH # @@ -188,13 +187,6 @@ if grep rhconfig $LINUX_OBJ/include/linux/version.h >/dev/null ; then EXTRA_KCFLAGS="-include $KERNEL_SOURCE_HEADER $EXTRA_KCFLAGS" fi -# Find the modpost utility -AC_CHECK_FILE([$LINUX_OBJ/scripts/mod/modpost], - [MODPOST=$LINUX_OBJ/scripts/mod/modpost], - [AC_MSG_ERROR([modpost not found.])] -) -AC_SUBST(MODPOST) - # this is needed before we can build modules LB_LINUX_UML LB_LINUX_VERSION @@ -207,11 +199,11 @@ 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 built.]) + AC_MSG_ERROR([Kernel modules cannot be build.]) ]) LB_LINUX_RELEASE -]) # end of LB_LINUX_PATH +]) # # LB_LINUX_UML diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am index 4377660d31..f7b83ad06b 100644 --- a/ldiskfs/ldiskfs/autoMakefile.am +++ b/ldiskfs/ldiskfs/autoMakefile.am @@ -70,11 +70,3 @@ CLEANFILES = sources $(notdir $(linux_headers) $(ext3_headers) $(ext3_sources) $ clean: clean-am rm -rf linux linux-stage - -all: @LINUX_OBJ@/Module.symvers - -# Update the kernel's Module.symvers to add ldiskfs symbols before building -# fsfilt_ldiskfs - see bug 12842. -@LINUX_OBJ@/Module.symvers: ldiskfs.o - $(MODPOST) -m -i @LINUX_OBJ@/Module.symvers \ - -o @LINUX_OBJ@/Module.symvers ldiskfs.o -- GitLab