- Small changes for packaging

diff --git a/lustre/demos/Makefile.am b/lustre/demos/Makefile.am
index 0538049..49d579d 100644 (file)
--- a/lustre/demos/Makefile.am
+++ b/lustre/demos/Makefile.am
@@ -8,3 +8,6 @@ demo_SCRIPTS = baseclean.sh basesetup.sh obdfsclean.sh obdfssetup.sh \
        snaprest.sh snaprestclean.sh snapsetup.sh snaptest.sh
 demo_DATA = config.sh
 EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
+
+include $(top_srcdir)/Rules
+

diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am
index 508c95d..8ffdfb5 100644 (file)
--- a/lustre/doc/Makefile.am
+++ b/lustre/doc/Makefile.am
@@ -18,3 +18,6 @@ SUFFIXES = .sgml .html .txt
 
 dist-hook:
        rm -rf $(distdir)/figs/CVS
+
+include $(top_srcdir)/Rules
+

diff --git a/lustre/lib/Makefile.am b/lustre/lib/Makefile.am
index b0bb868..0b09498 100644 (file)
--- a/lustre/lib/Makefile.am
+++ b/lustre/lib/Makefile.am
@@ -1,2 +1,3 @@
 EXTRA_DIST = mds_pack.c  mds_updates.c  obd_pack.c  page.c
 
+include $(top_srcdir)/Rules

diff --git a/lustre/lib/page.c b/lustre/lib/page.c
index f7f72eb..7f5a0ec 100644 (file)
--- a/lustre/lib/page.c
+++ b/lustre/lib/page.c
@@ -113,6 +113,7 @@ int lustre_prepare_page(unsigned from, unsigned to, struct page *page)
                 unlock_page(page);
                 CERROR("page index %ld from %d to %d err %d\n",
                                 page->index, from, to, err);
+                BUG();
         }
         return err;
 }

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 9ff8002..f10e86e 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -332,6 +332,7 @@ static int ost_brw_read(struct ost_obd *obddev, struct ptlrpc_request *req)
         for (i = 0; i < objcount; i++) {
                ost_unpack_ioo((void *)&tmp1, &ioo);
                if (tmp2 + ioo->ioo_bufcnt > end2) { 
+                        BUG();
                        rc = -EFAULT;
                        break; 
                }

diff --git a/lustre/scripts/.cvsignore b/lustre/scripts/.cvsignore
index e530020..104ddf7 100644 (file)
--- a/lustre/scripts/.cvsignore
+++ b/lustre/scripts/.cvsignore
@@ -1,4 +1,5 @@
 .Xrefs
+lustre.spec
 config.log
 config.status
 configure

diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index 8b450f1..5f8bb20 100644 (file)
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -4,3 +4,5 @@
 # See the file COPYING in this distribution
 
 EXTRA_DIST = license-status maketags.sh mkobddevs obdtrace_demo.scr lustre.spec
+include $(top_srcdir)/Rules
+

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index cf2d6ef..6919409 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 # Create the pristine source directory.
 mkdir -p $RPM_BUILD_ROOT/usr/src/obd-%{version}
 tar -cf - . | (cd $RPM_BUILD_ROOT/usr/src/obd-%{version} && tar -xvBpf -)
+mkdir -p $RPM_BUILD_ROOT/tmp
+echo :pserver:anonymous@cvs.lustre.sf.net:/cvsroot/lustre > $RPM_BUILD_ROOT/tmp/Root
+(cd $RPM_BUILD_ROOT/usr/src/obd-%{version} && find . -name Root -exec cp $RPM_BUILD_ROOT/tmp/Root {} \; )
 
 # Set an explicit path to our Linux tree, if we can.
 ./configure --enable-linuxdir=%{linuxdir} --enable-portalsdir=%{portalsdir}

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 6995651..fd2ab55 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -8,3 +8,5 @@ testreq_SOURCES = testreq.c
 truncate_SOURCES = truncate.c
 openunlink_SOURCES = openunlink.c
 
+include $(top_srcdir)/Rules
+

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index dd2d690..7f836ff 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -15,7 +15,7 @@ add_uuid ost
 quit
 EOF
 
-new_fs ext2 /tmp/ost 10000
+new_fs ext2 /tmp/ost 80000
 OST=$LOOPDEV
 MDSFS=ext2
 new_fs ${MDSFS} /tmp/mds 10000

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index ae40c02..4b64b74 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -8,3 +8,5 @@ CPPFLAGS :=
 LDADD := -lreadline -ltermcap # -lefence
 bin_PROGRAMS = obdctl
 obdctl_SOURCES = parser.c obdctl.c
+
+include $(top_srcdir)/Rules