- remove obdfs/Makefile

- get kernel version from version.h, fix uml kversion bug

diff --git a/lustre/configure.in b/lustre/configure.in
index 01366dc..2efaae8 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -64,13 +64,15 @@ AC_MSG_CHECKING(for Linux release)
 
 dnl We need to rid ourselves of the nasty [ ] quotes.
 changequote(, )
-LVERSION="`sed -ne 's/^VERSION[        ]*=[    ]*//gp' $LINUX/Makefile`"
-PATCHLEVEL="`sed -ne 's/^PATCHLEVEL[   ]*=[    ]*//gp' $LINUX/Makefile`"
-SUBLEVEL="`sed -ne 's/^SUBLEVEL[       ]*=[    ]*//gp' $LINUX/Makefile`"
-EXTRAVERSION="`sed -ne 's/^EXTRAVERSION[       ]*=[    ]*//gp' $LINUX/Makefile`"
+dnl LVERSION="`sed -ne 's/^VERSION[    ]*=[    ]*//gp' $LINUX/Makefile`"
+dnl PATCHLEVEL="`sed -ne 's/^PATCHLEVEL[       ]*=[    ]*//gp' $LINUX/Makefile`"
+dnl SUBLEVEL="`sed -ne 's/^SUBLEVEL[   ]*=[    ]*//gp' $LINUX/Makefile`"
+dnl EXTRAVERSION="`sed -ne 's/^EXTRAVERSION[   ]*=[    ]*//gp' $LINUX/Makefile`"
+dnl Get release from version.h
+RELEASE="`sed -ne 's/.*UTS_RELEASE[ "]*\([0-9.a-zA-Z-]*\).*/\1/p' $LINUX/include/linux/version.h`"
 changequote([, ])
 
-RELEASE="$LVERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
+dnl RELEASE="$LVERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
 moduledir='$(libdir)/modules/'$RELEASE/kernel
 AC_SUBST(moduledir)
 AC_SUBST(EXTRAVERSION)
@@ -92,6 +94,7 @@ AC_OUTPUT(Makefile lov/Makefile lib/Makefile ldlm/Makefile \
          obdecho/Makefile ptlrpc/Makefile \
        osc/Makefile mdc/Makefile mds/Makefile ost/Makefile utils/Makefile \
        tests/Makefile obdfilter/Makefile obdclass/Makefile \
-       llite/Makefile obdfs/Makefile demos/Makefile \
+       llite/Makefile demos/Makefile \
        doc/Makefile scripts/Makefile scripts/lustre.spec \
        extN/Makefile)
+# obdfs/Makefile 
\ No newline at end of file

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 81165b1..7ad50f1 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -75,7 +75,7 @@ find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/lustre-%{version}
 %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdclass.o
 %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdecho.o
 %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdfilter.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdfs.o
+#%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdfs.o
 %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/osc.o
 %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ost.o
 %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ptlrpc.o