Update of /cvsroot/ssic-linux/openssi/lustre/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv587/scripts
Modified Files:
Tag: OPENSSI-RH
Makefile.am lustre.spec.in version_tag.pl
Log Message:
Finish lustre-1.0.1 import.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/lustre/scripts/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am 7 Feb 2003 17:14:56 -0000 1.1
--- Makefile.am 28 Jan 2004 23:50:26 -0000 1.2
***************
*** 7,10 ****
--- 7,11 ----
initddir = $(sysconfdir)/init.d
initd_SCRIPTS = lustre
+
include $(top_srcdir)/Rules
Index: lustre.spec.in
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/lustre/scripts/lustre.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lustre.spec.in 22 Apr 2003 16:29:00 -0000 1.1
--- lustre.spec.in 28 Jan 2004 23:50:28 -0000 1.2
***************
*** 1,18 ****
# lustre.spec
! %define version HEAD
! %define kversion @RELEASE@
%define linuxdir @LINUX@
- %define portalsdir @PORTALS@
- %define portalslibdir @PORTALSLIB@
- Release: 0302240920chaos
Summary: Lustre Lite File System
Name: lustre-lite
Version: %{version}
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
%description
--- 1,16 ----
# lustre.spec
! %define version b_devel
! %define kversion @LINUXRELEASE@
%define linuxdir @LINUX@
Summary: Lustre Lite File System
Name: lustre-lite
Version: %{version}
+ Release: @RELEASE@
Copyright: GPL
Group: Utilities/System
Requires: lustre-modules, PyXML
Source: ftp://ftp.lustre.com/pub/lustre/lustre-%{version}.tar.gz
+ BuildRoot: /var/tmp/lustre-%{version}-root
%description
***************
*** 22,26 ****
%package -n lustre-modules
Summary: Kernel Lustre drivers for Linux %{kversion}
- Requires: portals-modules
Requires: modutils >= 2.4.10
Group: Development/Kernel
--- 20,23 ----
***************
*** 54,68 ****
! %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
%build
--- 51,64 ----
! #%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
%build
***************
*** 71,82 ****
# 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}'
! make
!
! %ifarch i386
! cd $RPM_BUILD_DIR/lustre-%{version}-lib/lustre-%{version}
! ./configure --with-lib --with-portals='%{portalsdir}'
--with-portalslib='%{portalslibdir}'
make
- %endif
%install
--- 67,72 ----
# Set an explicit path to our Linux tree, if we can.
cd $RPM_BUILD_DIR/lustre-%{version}
! ./configure --with-linux='%{linuxdir}'
make
%install
***************
*** 84,93 ****
make install prefix=$RPM_BUILD_ROOT
! %ifarch i386
! cd $RPM_BUILD_DIR/lustre-%{version}-lib/lustre-%{version}
! make install prefix=$RPM_BUILD_ROOT
%endif
-
# Create the pristine source directory.
cd $RPM_BUILD_DIR/lustre-%{version}
--- 74,89 ----
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}
***************
*** 101,112 ****
%files
%attr(-, root, root) /usr/sbin/lmc
%attr(-, root, root) /usr/sbin/lctl
%attr(-, root, root) /usr/sbin/lconf
%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/lib/lustre/python/*
%attr(-, root, root) /usr/lib/lustre/examples/llmount.sh
--- 97,118 ----
%files
+ %attr(-, root, root) /sbin/mount.lustre
%attr(-, root, root) /usr/sbin/lmc
%attr(-, root, root) /usr/sbin/lctl
%attr(-, root, root) /usr/sbin/lconf
+ %attr(-, root, root) /usr/sbin/lwizard
+ %attr(-, root, root) /usr/sbin/wiretest
+ %attr(-, root, root) /usr/sbin/lactive
%attr(-, root, root) /usr/sbin/llanalyze
! %attr(-, root, root) /usr/sbin/lfs
! %attr(-, root, root) /usr/sbin/gmnalnid
! %attr(-, root, root) /usr/bin/lfind
! %attr(-, root, root) /usr/bin/lstripe
! %attr(-, root, root) /usr/bin/mcreate
! %attr(-, root, root) /usr/bin/munlink
! %attr(-, root, root) /usr/bin/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
***************
*** 116,171 ****
%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/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}/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/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
--- 122,187 ----
%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) /lib/liblustreapi.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
%files -n lustre-modules
%attr(-, root, root) %doc COPYING
! %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/*.o
! #portals modules
! %attr(-, root, root) /lib/modules/%{kversion}/kernel/net/lustre/*.o
%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
***************
*** 175,179 ****
%attr(-, root, root) /usr/lib/lustre/lustre2ldif.xsl
%attr(-, root, root) /usr/lib/lustre/top.ldif
! %dir /var/lib/ldap/lustre
%attr(700, ldap, ldap) /var/lib/ldap/lustre
--- 191,195 ----
%attr(-, root, root) /usr/lib/lustre/lustre2ldif.xsl
%attr(-, root, root) /usr/lib/lustre/top.ldif
! #%dir /var/lib/ldap/lustre
%attr(700, ldap, ldap) /var/lib/ldap/lustre
***************
*** 182,195 ****
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
--- 198,220 ----
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 '/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 portals /etc/modules.conf || \
! # echo 'alias char-major-10-240 portals' >> /etc/modules.conf
!
! #grep -q '/dev/portals' /etc/modules.conf || \
! # echo 'alias /dev/portals portals' >> /etc/modules.conf
%postun
Index: version_tag.pl
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/lustre/scripts/version_tag.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** version_tag.pl 22 Apr 2003 15:01:29 -0000 1.1
--- version_tag.pl 28 Jan 2004 23:50:28 -0000 1.2
***************
*** 10,20 ****
my $kernver;
sub get_tag()
{
my $tag;
my $tagfile = new IO::File;
if (!$tagfile->open("CVS/Tag")) {
! return "HEAD";
} else {
my $tmp = <$tagfile>;
--- 10,34 ----
my $kernver;
+ # Use the CVS tag first otherwise use the portals version
sub get_tag()
{
my $tag;
+ my $line;
my $tagfile = new IO::File;
if (!$tagfile->open("CVS/Tag")) {
! my $verfile = new IO::File;
! if (!$verfile->open("portals/include/config.h")) {
! return "UNKNOWN";
! }
! while(defined($line = <$verfile>)) {
! $line =~ /\#define VERSION "(.*)"/;
! if ($1) {
! $tag = $1;
! last;
! }
! }
! $verfile->close();
! return $tag
} else {
my $tmp = <$tagfile>;
***************
*** 60,63 ****
--- 74,80 ----
my @statbuf = stat("$cur_dir/$file");
my $mtime = $statbuf[9];
+ if (!defined($mtime)) {
+ next;
+ }
my $local_date = gmtime($mtime);
if ($local_date ne $date &&
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
|
