- fix make dist

- bring spec file uptodate
- add rpms rule to main Makefile.am

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index 0ff680c..d9a6945 100644 (file)
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -15,5 +15,10 @@ configure: scripts/lustre.spec.in
 
 dist-hook:
        find $(distdir) -name .deps | xargs rm -rf
+       find $(distdir) -name CVS | xargs rm -rf
 
 include $(top_srcdir)/Rules
+
+rpms: dist Makefile
+       rpm -ta $(distdir).tar.gz
+

diff --git a/lustre/Rules b/lustre/Rules
index 828a8c9..00b17e3 100644 (file)
--- a/lustre/Rules
+++ b/lustre/Rules
@@ -21,4 +21,3 @@ tags:
        find $(top_srcdir)/../portals -name '*.[hc]' | xargs ctags -a
        find $(top_srcdir) -name '*.[hc]' | xargs ctags -a
 
-EXTRA_DIST += CVS
\ No newline at end of file

diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am
index e7b22e5..9f88aec 100644 (file)
--- a/lustre/doc/Makefile.am
+++ b/lustre/doc/Makefile.am
@@ -9,9 +9,14 @@ SUFFIXES = .lyx .pdf .sgml .html .txt .fig .eps
 
 DOCS = master.pdf lustre-HOWTO.txt
 IMAGES =  cache1.eps cache2.eps intermezzocache.eps intermezzofilesys.eps meta.eps metadata1.eps networklayer.eps bigpicture.eps intermezzo.eps mds.eps portals.eps client.eps layering.eps metadata.eps sb.eps cow.eps lockacq.eps obdfs.eps snapsetup.eps dirbodyapi.eps loraid.eps ost.eps updates.eps hotmigrate.eps lustreclusters.eps osthw.eps portals-lib.eps lockqueues.eps lockexample1.eps lockexample2.eps lockexample3.eps lockexample4.eps lockseverity.eps
-CLEANFILES = $(IMAGES) $(DOCS)
+LYXFILES= master.lyx evolution.lyx  llocks.lyx mgmt.lyx uncertain.lyx\
+       fs.lyx         lustre-HOWTO.lyx      namespace.lyx\
+       glossary.lyx   lustre-debugging.lyx  network.lyx\
+       intro.lyx      obdspec.lyx
 
-EXTRA_DIST = $(DOCS)
+MAINTAINERCLEANFILES =  $(IMAGES) $(DOCS)
+
+EXTRA_DIST = $(DOCS) $(IMAGES) $(LYXFILES)
 
 all: $(DOCS)
 

diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am
index 66b9203..f9bfc2a 100644 (file)
--- a/lustre/ldlm/Makefile.am
+++ b/lustre/ldlm/Makefile.am
@@ -16,9 +16,6 @@ LINX=l_lock.c
 ldlm_SOURCES = l_lock.c ldlm_lock.c ldlm_resource.c ldlm_test.c ldlm_lockd.c \
 ldlm_extent.c ldlm_request.c
 
-dist-hook:
-       list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done
-
 
 include $(top_srcdir)/Rules
 

diff --git a/lustre/lib/Makefile.am b/lustre/lib/Makefile.am
index ce88106..6212722 100644 (file)
--- a/lustre/lib/Makefile.am
+++ b/lustre/lib/Makefile.am
@@ -1,3 +1,3 @@
-EXTRA_DIST = mds_updates.c obd_pack.c page.c
+EXTRA_DIST = mds_updates.c obd_pack.c page.c ll_pack.c l_lock.c simple.c l_net.c
 
 include $(top_srcdir)/Rules

diff --git a/lustre/mdc/Makefile.am b/lustre/mdc/Makefile.am
index f5ba67d..b412741 100644 (file)
--- a/lustre/mdc/Makefile.am
+++ b/lustre/mdc/Makefile.am
@@ -17,8 +17,5 @@ ll_pack.c:
 mds_updates.c: 
        test -e mds_updates.c || ln -sf $(top_srcdir)/lib/mds_updates.c .
 
-dist-hook:
-       list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done
-
 
 include $(top_srcdir)/Rules

diff --git a/lustre/mds/Makefile.am b/lustre/mds/Makefile.am
index 1654b36..f5fb932 100644 (file)
--- a/lustre/mds/Makefile.am
+++ b/lustre/mds/Makefile.am
@@ -24,8 +24,6 @@ l_net.c:
 
 mds_SOURCES = handler.c mds_reint.c mds_fs.c $(LINX)
 
-dist-hook:
-       list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done
 
 include $(top_srcdir)/Rules
 

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 6919409..fa15751 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -1,16 +1,16 @@
 # obd.spec
-%define version 0.3.2.0
+%define version 0.3.2.1
 %define kversion @RELEASE@
 %define linuxdir @LINUX@
 %define portalsdir @PORTALS@
-Release: 0
+Release: 1
 
 Summary: Lustre Lite File System
 Name: lustre-lite
 Version: %{version}
 Copyright: GPL
 Group: Utilities/System
-Requires: lustre-modules, perl-Storable, perl-Term-ReadLine-Gnu
+Requires: lustre-modules, libxml2
 BuildRoot: /var/tmp/obd-%{version}-root
 Source: ftp://ftp.lustre.com/pub/lustre/obd-%{version}.tar.gz
 
@@ -38,39 +38,49 @@ Lustre Lite Source for further development
 %build
 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}
+make clean
 make
 
 %install
 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}
+
+
 %files
 %attr(-, root, root) %doc COPYING FDL
-%attr(-, root, root) %doc doc/API.txt doc/OBD-HOWTO.sgml doc/obdspec.sgml
-%attr(-, root, root) %doc doc/OLVM.txt doc/figs doc/notes.txt
-%attr(-, root, root) %doc doc/obdtrace_demo.txt
+%attr(-, root, root) %doc doc/master.pdf doc/lustre-HOWTO.txt
+%attr(-, root, root) /usr/bin/directio
+%attr(-, root, root) /usr/bin/fsx
+%attr(-, root, root) /usr/bin/mcreate
 %attr(-, root, root) /usr/bin/obdctl
+%attr(-, root, root) /usr/bin/openme
+%attr(-, root, root) /usr/bin/openunlink
+%attr(-, root, root) /usr/bin/tchmod
+%attr(-, root, root) /usr/bin/toexcl
+%attr(-, root, root) /usr/bin/truncate
+%attr(-, root, root) /usr/bin/writeme
 
 %files -n lustre-modules
 %attr(-, root, root) %doc COPYING
-%attr(-, root, root) /lib/modules/%{kversion}/fs/llight.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/ptlrpc.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/mds.o
+%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/ost.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/osc.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/obdfilter.o
 %attr(-, root, root) /lib/modules/%{kversion}/fs/obdecho.o
-%attr(-, root, root) /lib/modules/%{kversion}/fs/obdext2.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
 
 %files -n lustre-source
 %attr(-, root, root) /usr/src/obd-%{version}

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 7322704..b62d520 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -5,7 +5,7 @@ CFLAGS:=-g -I. -I/usr/include/libxml2 -I/usr/include/glib-1.2 -I$(PORTALS)/inclu
 -I/usr/lib/glib/include -I$(srcdir)/../include -Wall
 KFLAGS:=
 CPPFLAGS :=
-LDADD := -lreadline -ltermcap -lxml2 # -lefence
+LDADD := -lreadline -lncurses -lxml2 # -lefence
 bin_PROGRAMS = obdctl
 obdctl_SOURCES = parser.c obdctl.c