-# obd.spec
-%define version 0.3.2.1
+# lustre.spec
+%define version HEAD
%define kversion @RELEASE@
%define linuxdir @LINUX@
%define portalsdir @PORTALS@
-Release: 1
+%define portalslibdir @PORTALSLIB@
+Release: 0208282230chaos
Summary: Lustre Lite File System
Name: lustre-lite
Version: %{version}
Copyright: GPL
Group: Utilities/System
-Requires: lustre-modules, libxml2
-BuildRoot: /var/tmp/obd-%{version}-root
-Source: ftp://ftp.lustre.com/pub/lustre/obd-%{version}.tar.gz
+Requires: lustre-modules, PyXML
+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,
%package -n lustre-modules
Summary: Kernel Lustre drivers for Linux %{kversion}
+Requires: portals-modules
Group: Development/Kernel
%description -n lustre-modules
%description -n lustre-source
Lustre Lite Source for further development
+%package -n lustre-doc
+Summary: Documentation and sample configuration files
+Group: Documentation
+# FIXME: BuildArch overrides all the packages in rpm 4.0.4-7x
+#BuildArch: noarch
+
+%description -n lustre-doc
+Documentation and sample configuration files for Lustre
+
%prep
-%setup -n obd-%{version}
+%setup -qn lustre-%{version}
%build
rm -rf $RPM_BUILD_ROOT
# Set an explicit path to our Linux tree, if we can.
-./configure --enable-linuxdir=%{linuxdir} --enable-portalsdir=%{portalsdir}
-make clean
+./configure --with-linux='%{linuxdir}' --with-portals='%{portalsdir}' --with-portalslib='%{portalslibdir}'
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}
-
+mkdir -p $RPM_BUILD_ROOT/usr/src
+rm -f lustre-source
+ln -s $RPM_BUILD_ROOT/usr/src lustre-source
+make distdir distdir=lustre-source/lustre-%{version}
%files
+%attr(-, root, root) /usr/sbin/lmc
+%attr(-, root, root) /usr/sbin/lctl
+%attr(-, root, root) /usr/sbin/lconf
+%attr(-, root, root) /usr/lib/lustre/examples/llmount.sh
+%attr(-, root, root) /usr/lib/lustre/examples/llmountcleanup.sh
+%attr(-, root, root) /usr/lib/lustre/examples/llecho.sh
+%attr(-, root, root) /usr/lib/lustre/examples/local.sh
+%attr(-, root, root) /usr/lib/lustre/examples/uml.sh
+%attr(-, root, root) /usr/lib/lustre/examples/lov.sh
+%attr(-, root, root) /etc/init.d/lustre
+
+%files -n lustre-doc
%attr(-, root, root) %doc COPYING FDL
-%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
+%attr(-, root, root) %doc doc/lustre.pdf doc/lustre-HOWTO.txt
+%attr(-, root, root) %doc tests/client-echo.cfg tests/client-mount.cfg
+%attr(-, root, root) %doc tests/client-mount2.cfg
+%attr(-, root, root) %doc tests/elan-client.cfg tests/elan-server.cfg
+%attr(-, root, root) %doc tests/ldlm.cfg tests/lustre.cfg
+%attr(-, root, root) %doc tests/mds.cfg tests/net-client.cfg
+%attr(-, root, root) %doc tests/net-local.cfg tests/net-server.cfg
+%attr(-, root, root) %doc tests/obdecho.cfg tests/obdfilter.cfg
%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/lustre/extN.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/ldlm.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/llite.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/mdc.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/mds.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/fsfilt_extN.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdclass.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdecho.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdfilter.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/lov.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/osc.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/ost.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/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
fi
depmod -ae || exit 0
-#
-# Modify /etc/modules.conf to add lusre rules
-# lustre_lite depends on llite.o
-# /dev/obd obdclass.o
-# obdclass depends on portals
-# the rest should be loaded by kerneld automatically
+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