X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fscripts%2Flustre.spec.in;h=1b2ba019b21bbd4af966389a6680144aa77df134;hb=a2a0746305449dbd925879b14dc2c0d6040bb8bf;hp=3657c7a77e020db2b439e1da664e72a0caaa558a;hpb=a4346f1ee87f221d8541ad31b2efb3bba41a4df4;p=fs%2Flustre-release.git diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in index 3657c7a..1b2ba01 100644 --- a/lustre/scripts/lustre.spec.in +++ b/lustre/scripts/lustre.spec.in @@ -1,19 +1,17 @@ # lustre.spec -%define version HEAD -%define kversion @RELEASE@ +%define version b_devel +%define kversion @LINUXRELEASE@ %define linuxdir @LINUX@ -%define portalsdir @PORTALS@ -%define portalslibdir @PORTALSLIB@ -Release: 0302240920chaos Summary: Lustre Lite File System Name: lustre-lite Version: %{version} +Release: @RELEASE@ Copyright: GPL Group: Utilities/System Requires: lustre-modules, PyXML -BuildRoot: /var/tmp/lustre-%{version}-root Source: ftp://ftp.lustre.com/pub/lustre/lustre-%{version}.tar.gz +BuildRoot: /var/tmp/lustre-%{version}-root %description The Lustre Lite Cluster File System: kernel drivers for file system, @@ -21,7 +19,7 @@ servers and utilities. %package -n lustre-modules Summary: Kernel Lustre drivers for Linux %{kversion} -Requires: portals-modules +Requires: modutils >= 2.4.10 Group: Development/Kernel %description -n lustre-modules @@ -52,42 +50,41 @@ Requires: openldap-servers, openldap-clients, python-ldap, 4Suite Configures openldap server for LDAP Lustre config database -%package -n liblustre -Summary: Lustre Lib -Group: Development/Kernel - -%description -n liblustre -Lustre lib binary package. +#%package -n liblustre +#Summary: Lustre Lib +#Group: Development/Kernel +#%description -n liblustre +#Lustre lib binary package. %prep %setup -qn lustre-%{version} -%setup -c -n lustre-%{version}-lib +#%setup -c -n lustre-%{version}-lib %build rm -rf $RPM_BUILD_ROOT # Set an explicit path to our Linux tree, if we can. cd $RPM_BUILD_DIR/lustre-%{version} -./configure --with-linux='%{linuxdir}' --with-portals='%{portalsdir}' --with-portalslib='%{portalslibdir}' +./configure --with-linux='%{linuxdir}' make -%ifarch i386 -cd $RPM_BUILD_DIR/lustre-%{version}-lib/lustre-%{version} -./configure --with-lib --with-portals='%{portalsdir}' --with-portalslib='%{portalslibdir}' -make -%endif - %install cd $RPM_BUILD_DIR/lustre-%{version} make install prefix=$RPM_BUILD_ROOT -%ifarch i386 -cd $RPM_BUILD_DIR/lustre-%{version}-lib/lustre-%{version} -make install prefix=$RPM_BUILD_ROOT +%ifarch alpha +# this hurts me + conf_flag= + linuxdir=%{linuxdir} + test -d $linuxdir && conf_flag=--with-linux=$linuxdir + make clean + ./configure --enable-rtscts-myrinet $conf_flag + make + cp linux/rtscts/rtscts.o $RPM_BUILD_ROOT/lib/modules/%{kversion}/kernel/net/lustre/rtscts_myrinet.o + cp user/myrinet_utils/mcpload $RPM_BUILD_ROOT/usr/sbin/mcpload %endif - # Create the pristine source directory. cd $RPM_BUILD_DIR/lustre-%{version} mkdir -p $RPM_BUILD_ROOT/usr/src @@ -102,38 +99,62 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/ldap/lustre %attr(-, root, root) /usr/sbin/lmc %attr(-, root, root) /usr/sbin/lctl %attr(-, root, root) /usr/sbin/lconf +%attr(-, root, root) /usr/sbin/lactive %attr(-, root, root) /usr/sbin/llanalyze %attr(-, root, root) /usr/sbin/lfind %attr(-, root, root) /usr/sbin/lstripe %attr(-, root, root) /usr/sbin/mcreate %attr(-, root, root) /usr/sbin/mkdirmany +%attr(-, root, root) /usr/sbin/llstat.pl +%attr(-, root, root) /usr/sbin/llobdstat.pl +%attr(-, root, root) /usr/sbin/load_ldap.sh +%attr(-, root, root) /usr/lib/lustre/python/* %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) /usr/lib/lustre/examples/echo.sh +%attr(-, root, root) /usr/lib/lustre/examples/llechocleanup.sh + %attr(-, root, root) /etc/init.d/lustre +%attr(-, root, root) /usr/sbin/acceptor +%attr(-, root, root) /usr/sbin/ptlctl +%attr(-, root, root) /usr/sbin/debugctl +%attr(-, root, root) /lib/libportals.a +%attr(-, root, root) /lib/libptlctl.a +%attr(-, root, root) /lib/libtcpnal.a +%attr(-, root, root) /usr/include/lustre/*.h +%attr(-, root, root) /usr/sbin/lload +%attr(-, root, root) /usr/sbin/obdbarrier +%attr(-, root, root) /usr/sbin/obdio +%attr(-, root, root) /usr/sbin/routerstat +%attr(-, root, root) /usr/sbin/wirecheck + +%ifarch alpha +%attr(-, root, root) /usr/sbin/mcpload +%endif %files -n lustre-doc %attr(-, root, root) %doc COPYING FDL %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 +#%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}/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/fsfilt_ext3.o +%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/fsfilt_reiserfs.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 @@ -141,30 +162,40 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/ldap/lustre %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 +%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/ptlbd.o +%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/cobd.o +#portals modules +%attr(-, root, root) /lib/modules/%{kversion}/kernel/net/lustre/kptlrouter.o +%attr(-, root, root) /lib/modules/%{kversion}/kernel/net/lustre/*nal.o +%attr(-, root, root) /lib/modules/%{kversion}/kernel/net/lustre/portals.o +%ifarch alpha +%attr(-, root, root) /lib/modules/%{kversion}/kernel/net/lustre/p3mod.o +%attr(-, root, root) /lib/modules/%{kversion}/kernel/net/lustre/rtscts.o +%endif %files -n lustre-source %attr(-, root, root) /usr/src/lustre-%{version} -%ifarch i386 -%files -n liblustre -%attr(-, root, root) /lib/lustre -%attr(-, root, root) /lib/lustre/liblov.a -%attr(-, root, root) /lib/lustre/liblustreclass.a -%attr(-, root, root) /lib/lustre/libptlrpc.a -%attr(-, root, root) /lib/lustre/libobdecho.a -%attr(-, root, root) /lib/lustre/libldlm.a -%attr(-, root, root) /lib/lustre/libosc.a -%attr(-, root, root) /usr/sbin/lctl -%attr(-, root, root) /usr/sbin/lfind -%attr(-, root, root) /usr/sbin/lstripe -%attr(-, root, root) /usr/sbin/obdio -%attr(-, root, root) /usr/sbin/obdbarrier -%attr(-, root, root) /usr/sbin/obdstat -%attr(-, root, root) /usr/sbin/lload -%attr(-, root, root) /usr/sbin/lconf -%attr(-, root, root) /usr/sbin/lmc -%attr(-, root, root) /usr/sbin/llanalyze -%endif +#%ifarch i386 +#%files -n liblustre +#%attr(-, root, root) /lib/lustre +#%attr(-, root, root) /lib/lustre/liblov.a +#%attr(-, root, root) /lib/lustre/liblustreclass.a +#%attr(-, root, root) /lib/lustre/libptlrpc.a +#%attr(-, root, root) /lib/lustre/libobdecho.a +#%attr(-, root, root) /lib/lustre/libldlm.a +#%attr(-, root, root) /lib/lustre/libosc.a +#%attr(-, root, root) /usr/sbin/lctl +#%attr(-, root, root) /usr/sbin/lfind +#%attr(-, root, root) /usr/sbin/lstripe +#%attr(-, root, root) /usr/sbin/obdio +#%attr(-, root, root) /usr/sbin/obdbarrier +#%attr(-, root, root) /usr/sbin/obdstat +#%attr(-, root, root) /usr/sbin/lload +#%attr(-, root, root) /usr/sbin/lconf +#%attr(-, root, root) /usr/sbin/lmc +#%attr(-, root, root) /usr/sbin/llanalyze +#%endif %files -n lustre-ldap @@ -172,23 +203,32 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/ldap/lustre %attr(-, root, root) /etc/openldap/schema/lustre.schema %attr(-, root, root) /usr/lib/lustre/lustre2ldif.xsl %attr(-, root, root) /usr/lib/lustre/top.ldif -%dir /var/lib/ldap/lustre +#%dir /var/lib/ldap/lustre %attr(700, ldap, ldap) /var/lib/ldap/lustre %post if [ ! -e /dev/obd ]; then mknod /dev/obd c 10 241 fi +if [ ! -e /dev/portals ]; then + mknod /dev/portals c 10 240 +fi depmod -ae || exit 0 -grep -q obdclass /etc/modules.conf || \ - echo 'alias char-major-10-241 obdclass' >> /etc/modules.conf +#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 -grep -q '/dev/obd' /etc/modules.conf || \ - echo 'alias /dev/obd obdclass' >> /etc/modules.conf +#grep -q portals /etc/modules.conf || \ +# echo 'alias char-major-10-240 portals' >> /etc/modules.conf -grep -q '/dev/lustre' /etc/modules.conf || \ - echo 'alias /dev/lustre obdclass' >> /etc/modules.conf +#grep -q '/dev/portals' /etc/modules.conf || \ +# echo 'alias /dev/portals portals' >> /etc/modules.conf %postun depmod -ae || exit 0