- make rpms works

diff --git a/lustre/configure.in b/lustre/configure.in
index 413c67c..2935a55 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -7,11 +7,23 @@ AC_CANONICAL_SYSTEM
 # See the file COPYING in this distribution
 
 # Automake variables.  Steal the version number from lustre.spec.in.
-AM_INIT_AUTOMAKE(obd, builtin([esyscmd], [sed -ne '/^%define version /{ s/.*version //; p; q; }' scripts/lustre.spec.in]))
+AM_INIT_AUTOMAKE(lustre, builtin([esyscmd], [sed -ne '/^%define version /{ s/.*version //; p; q; }' scripts/lustre.spec.in]))
 #AM_MAINTAINER_MODE
 AC_PROG_CC
 AC_PROG_RANLIB
 
+# 
+# Check for required packages
+
+AC_PATH_PROG([XML2_CONFIG], [xml2-config], [],)
+if test -z "$XML2_CONFIG"; then
+       AC_MSG_ERROR([xml2-config not found; libxml2-dev libraries must be installed.])
+fi
+XML2_CFLAGS=$($XML2_CONFIG --cflags)
+XML2_LIBS=$($XML2_CONFIG --libs)
+AC_SUBST(XML2_CFLAGS)
+AC_SUBST(XML2_LIBS)
+
 # Kernel build environment.
 ac_default_prefix=
 bindir='${exec_prefix}/usr/bin'
@@ -59,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)
 
@@ -76,7 +88,8 @@ AC_SUBST(docdir)
 demodir='$(docdir)/demo'
 AC_SUBST(demodir)
 
-AC_OUTPUT(Makefile lib/Makefile ldlm/Makefile obdecho/Makefile ptlrpc/Makefile \
+AC_OUTPUT(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 \

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 6919409..b7e69c3 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -1,18 +1,18 @@
-# obd.spec
-%define version 0.3.2.0
+# lustre.spec
+%define version 0.4.4
 %define kversion @RELEASE@
 %define linuxdir @LINUX@
 %define portalsdir @PORTALS@
-Release: 0
+Release: 4
 
 Summary: Lustre Lite File System
 Name: lustre-lite
 Version: %{version}
 Copyright: GPL
 Group: Utilities/System
-Requires: lustre-modules, perl-Storable, perl-Term-ReadLine-Gnu
-BuildRoot: /var/tmp/obd-%{version}-root
-Source: ftp://ftp.lustre.com/pub/lustre/obd-%{version}.tar.gz
+Requires: lustre-modules, libxml2
+BuildRoot: /var/tmp/lustre-%{version}-root
+Source: ftp://ftp.lustre.com/pub/lustre/lustre-%{version}.tar.gz
 
 %description
 The Lustre Lite Cluster File System: kernel drivers for file system,
@@ -33,17 +33,17 @@ Group: Development/Kernel
 Lustre Lite Source for further development
 
 %prep
-%setup -n obd-%{version}
+%setup -q -n lustre-%{version}
 
 %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/usr/src/lustre-%{version}
+tar -cf - . | (cd $RPM_BUILD_ROOT/usr/src/lustre-%{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 {} \; )
+(cd $RPM_BUILD_ROOT/usr/src/lustre-%{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}
@@ -54,30 +54,47 @@ make install prefix=$RPM_BUILD_ROOT
 
 %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/obdctl
 
 %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/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/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}/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_ext2.o
+%attr(-, root root) /lib/modules/%{kversion}/kernel/fs/mds_ext3.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
+   mknod /dev/obd c 10 241
+fi
+
 depmod -ae || exit 0
 
+grep -q obdclass /etc/modules.conf || \
+       echo 'alias char-major-10-241 obdclass' >> /etc/modules.conf
+
+grep -q '/dev/obd' /etc/modules.conf || \
+       echo 'alias /dev/obd obdclass' >> /etc/modules.conf
+
+grep -q '/dev/lustre' /etc/modules.conf || \
+       echo 'alias /dev/lustre obdclass' >> /etc/modules.conf
+
+
 %postun
 depmod -ae || exit 0