-# obd.spec
-%define version 0.3.2.1
+# lustre.spec
+%define version 0.5.0
%define kversion @RELEASE@
%define linuxdir @LINUX@
%define portalsdir @PORTALS@
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
+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
Lustre Lite Source for further development
%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
make
%install
# 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
%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) /usr/sbin/obdctl
+%attr(-, root, root) /usr/sbin/lctl
+%attr(-, root, root) /usr/sbin/llsetup.sh
+%attr(-, root, root) /usr/sbin/llrsetup.sh
+%attr(-, root, root) /usr/sbin/llcleanup.sh
+%attr(-, root, root) /lib/lustre/common.sh
+%attr(-, root, root) /etc/lustre/lustre.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/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
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