- updates for rpm

diff --git a/lustre/configure.in b/lustre/configure.in
index 7431e7f..01366dc 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -71,7 +71,7 @@ EXTRAVERSION="`sed -ne 's/^EXTRAVERSION[      ]*=[    ]*//gp' $LINUX/Makefile`"
 changequote([, ])
 
 RELEASE="$LVERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
-moduledir='$(libdir)/modules/'$RELEASE
+moduledir='$(libdir)/modules/'$RELEASE/kernel
 AC_SUBST(moduledir)
 AC_SUBST(EXTRAVERSION)
 

diff --git a/lustre/llite/super.c b/lustre/llite/super.c
index 1916de6..15a6724 100644 (file)
--- a/lustre/llite/super.c
+++ b/lustre/llite/super.c
@@ -114,7 +114,6 @@ static struct super_block * ll_read_super(struct super_block *sb,
         }
 
         obd = class_uuid2obd(mds); 
-        obd->u.mdc.mdc_max_mdsize = sizeof(struct lov_stripe_md); 
         if (!obd) {
                 CERROR("MDS %s: not setup or attached\n", mds);
                 GOTO(out_free, sb = NULL);

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index b5810f4..367b53c 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -11,7 +11,7 @@ Version: %{version}
 Copyright: GPL
 Group: Utilities/System
 Requires: lustre-modules, libxml2
-BuildRoot: /var/tmp/obd-%{version}-root
+BuildRoot: /var/tmp/lustre-%{version}-root
 Source: ftp://ftp.lustre.com/pub/lustre/lustre-%{version}.tar.gz
 
 %description
@@ -49,8 +49,8 @@ make install prefix=$RPM_BUILD_ROOT
 
 # Create the pristine source directory.
 make distclean
-mkdir -p $RPM_BUILD_ROOT/usr/src/obd-%{version}
-find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/obd-%{version}
+mkdir -p $RPM_BUILD_ROOT/usr/src/lustre-%{version}
+find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/lustre-%{version}
 
 
 %files
@@ -66,22 +66,22 @@ find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/obd-%{version}
 
 %files -n lustre-modules
 %attr(-, root, root) %doc COPYING
-%attr(-, root, root) /lib/modules/%{kversion}/fs/extN.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/ldlm.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/llite.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/mdc.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/mds.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/mds_extN.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/obdclass.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/obdecho.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/obdfilter.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/obdfs.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/osc.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/ost.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/ptlrpc.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/extN.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ldlm.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/llite.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/mdc.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/mds.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/mds_extN.o
+%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/osc.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ost.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ptlrpc.o
 
 %files -n lustre-source
-%attr(-, root, root) /usr/src/obd-%{version}
+%attr(-, root, root) /usr/src/lustre-%{version}
 
 %post
 if [ ! -e /dev/obd ]; then

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index 9170c07..4efecf0 100644 (file)
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -3,14 +3,28 @@ export PATH=$PATH:/sbin:/usr/sbin
 
 [ -d /r ] && R=/r
 
-PORTALS=$SRCDIR/../../portals
-LUSTRE=$SRCDIR/..
+# check if running in source directory
+# will probably need to create variable for each module.
+if [ -f $SRCDIR/Makefile.am ]; then
+    PORTALS=$SRCDIR/../../portals
+    LUSTRE=$SRCDIR/..
 
-PTLCTL=$PORTALS/linux/utils/ptlctl
-DBGCTL=$PORTALS/linux/utils/debugctl
-ACCEPTOR=$PORTALS/linux/utils/acceptor
+    PTLCTL=$PORTALS/linux/utils/ptlctl
+    DBGCTL=$PORTALS/linux/utils/debugctl
+    ACCEPTOR=$PORTALS/linux/utils/acceptor
 
-OBDCTL=$LUSTRE/utils/obdctl
+    OBDCTL=$LUSTRE/utils/obdctl
+else
+    # should have configure set the paths here
+    BINDIR=/usr/sbin
+    PORTALS=/lib/modules
+    LUSTRE=/lib/modules
+
+    PTLCTL=$BINDIR/ptlctl
+    DBGCTL=$BINDIR/debugctl
+    ACCEPTOR=$BINDIR/acceptor
+    OBDCTL=$BINDIR/obdctl
+fi
 
 LOOPNUM=0; export LOOPNUM
 if [ -b /dev/loop0 ]; then

diff --git a/lustre/tests/llcleanup.sh b/lustre/tests/llcleanup.sh
index ff6236c..922bf64 100755 (executable)
--- a/lustre/tests/llcleanup.sh
+++ b/lustre/tests/llcleanup.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 SRCDIR="`dirname $0`/"
+[ -f $SRCDIR/common.sh ] || SRCDIR="/lib/lustre"
+
 . $SRCDIR/common.sh
 
 setup_opts "$@"

diff --git a/lustre/tests/llrsetup.sh b/lustre/tests/llrsetup.sh
index cfcd7b3..44bfcae 100644 (file)
--- a/lustre/tests/llrsetup.sh
+++ b/lustre/tests/llrsetup.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 SRCDIR="`dirname $0`/"
+[ -f $SRCDIR/common.sh ] || SRCDIR="/lib/lustre"
+
 . $SRCDIR/common.sh
 
 setup_opts "$@"

diff --git a/lustre/tests/llsetup.sh b/lustre/tests/llsetup.sh
index 0f7df5d..3df8172 100644 (file)
--- a/lustre/tests/llsetup.sh
+++ b/lustre/tests/llsetup.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 SRCDIR="`dirname $0`/"
+[ -f $SRCDIR/common.sh ] || SRCDIR="/lib/lustre"
+
 . $SRCDIR/common.sh
 
 setup_opts "$@"