So I seem to have realized that Greg and Kevin's changes to the xcpu spec file didn't somehow make their way to the svn repository.
I made a few changes to the original spec file, added xget and Greg's multilib patch have built updated tarballs, source rpms and x86 rpms and put them up on the XCPU download page at http://www.xcpu.org/dl/ The i386 ones work for me, but let me know if you see any issues. It would be great if somebody would help in building the x86_64 rpms too. Signed-off-by: Abhishek Kulkarni <[EMAIL PROTECTED]>
Index: misc/xcpu.spec =================================================================== --- misc/xcpu.spec (revision 690) +++ misc/xcpu.spec (working copy) @@ -1,22 +1,14 @@ -# Philip Soltero; [EMAIL PROTECTED] -# Scalable Systems Lab -# Computer Science Department -# University of New Mexico -# -# Packages the XCPU cluster management software developed by the Los Alamos -# National Laboratories. - Name: xcpu Summary: Provides a means to remotely execute software on a cluster. -Version: 1.1 -Release: s1 -Group: Applications/System -Vendor: Los Alamos National Laboratories -URL: http://www.xcpu.org/dl/xcpu-1.1 -Packager: Philip Soltero <[EMAIL PROTECTED]> +Version: 1.2 +Release: 2.nsa1 +Group: System Environment/Clustering +URL: http://www.xcpu.org/dl/xcpu-1.2 License: MIT/GPL -Source0: %{name}-%{version}.tar.gz +Source: xcpu-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version} +Patch1000: xcpu-1.2-multilib.patch +BuildRequires: elfutils-libelf-devel %description Xcpu is a suite for accessing resources, executing jobs and managing nodes @@ -24,11 +16,11 @@ nodes or a head node and a set of client programs and libraries which can be used to communicate with the servers or write applications that access them. -%package server +%package node Summary: XCPU server that needs to be installed on every node -Group: Applications/System +Group: System Environment/Clustering -%description server +%description node Xcpu is a suite for accessing resources, executing jobs and managing nodes in a cluster configuration. Xcpu contains a set of servers running on remote nodes or a head node and a set of client programs and libraries which can be @@ -38,7 +30,7 @@ %package devel Summary: Libraries for developing tools that talk to the xcpu server -Group: Development/Libraries +Group: System Environment/Development %description devel Xcpu is a suite for accessing resources, executing jobs and managing nodes @@ -49,36 +41,23 @@ If you want to write your own utilities that talk to the xcpu server, you need to install this package. -%package utils -Summary: XCPU head node utilities -Group: Applications/System +%package xget +Summary: xget file transfer server and client (stand-alone) +Group: System Environment/Clustering -%description utils -Xcpu is a suite for accessing resources, executing jobs and managing nodes -in a cluster configuration. Xcpu contains a set of servers running on remote -nodes or a head node and a set of client programs and libraries which can be -used to communicate with the servers or write applications that access them. +%description xget +This package provides a stand-alone file transfer server/client. -This package contains the standard xcpu utilities - -%package xbootfs -Summary: xbootfs file transfer server (stand-alone) -Group: Applications/System - -%description xbootfs -This package provides a stand-alone boot server. When the xbootfs server is -started, it will check for xbootfs config files in /etc/sysconfig/xbootfs and -start a server for each file being served. This can be installed on master -and client nodes. - %prep umask 022 -%setup -q +%setup -q -n xcpu-%{version} +%patch1000 -p0 %build umask 022 %{__make} +%{__make} -C xget %install umask 022 @@ -87,67 +66,76 @@ %{__make} install INSTALLPREFIX=$RPM_BUILD_ROOT/usr %{__make} installman INSTALLPREFIX=$RPM_BUILD_ROOT/usr %{__make} installscripts INSTALLPREFIX=$RPM_BUILD_ROOT +%{__install} -m 755 xget/xget $RPM_BUILD_ROOT/usr/sbin/xget +# not packaging xbootfs right now +rm -f $RPM_BUILD_ROOT/%{_sbindir}/xbootfs +rm -f $RPM_BUILD_ROOT/etc/init.d/xbootfs +rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/xbootfs.1 + + %clean %{__rm} -rf %{buildroot} -%post server +%post node chkconfig --add xcpufs -%preun server +%preun node chkconfig --del xcpufs -%post xbootfs -chkconfig --add xbootfs +%files +%defattr(-,root,root) +%attr(0755,root,root) %{_bindir}/statfs +%attr(0755,root,root) %{_bindir}/xgetent +%attr(0755,root,root) %{_bindir}/xk +%attr(0755,root,root) %{_bindir}/xps +%attr(0755,root,root) %{_bindir}/xrx +%attr(0755,root,root) %{_bindir}/xstat +%attr(0755,root,root) %{_bindir}/xgroupset +%attr(0755,root,root) %{_bindir}/xuserset +%{_mandir}/man1/xk.1.gz +%{_mandir}/man1/xgetent.1.gz +%{_mandir}/man1/xps.1.gz +%{_mandir}/man1/xrx.1.gz +%{_mandir}/man1/xstat.1.gz +%{_mandir}/man1/xgroupset.1.gz +%{_mandir}/man1/xuserset.1.gz +%{_mandir}/man4/statfs.4.gz -%preun xbootfs -chkconfig --del xbootfs - -%files server -%defattr(0444,root,root) +%files node +%defattr(-,root,root) %attr(0755,root,root) /etc/init.d/xcpufs -%attr(0555,root,root) /usr/sbin/xcpufs -/usr/share/man/man4/xcpufs.4.gz +%attr(0755,root,root) %{_sbindir}/xcpufs +%{_mandir}/man4/xcpufs.4.gz %files devel -%defattr(0444,root,root) -/usr/include/libxauth.h -/usr/include/libxcpu.h -/usr/include/spclient.h -/usr/include/spfs.h -/usr/include/strutil.h -/usr/include/xcpu.h -/usr/lib/libspclient.a -/usr/lib/libspfs.a -/usr/lib/libstrutil.a -/usr/lib/libxcpu.a -/usr/lib/libxauth.a -/usr/share/man/man4/xcpu.4.gz +%defattr(-,root,root) +%{_includedir}/libxauth.h +%{_includedir}/libxcpu.h +%{_includedir}/npclient.h +%{_includedir}/npfs.h +%{_includedir}/spclient.h +%{_includedir}/spfs.h +%{_includedir}/strutil.h +%{_includedir}/xcpu.h +%{_libdir}/libnpclient.a +%{_libdir}/libnpfs.a +%{_libdir}/libspclient.a +%{_libdir}/libspfs.a +%{_libdir}/libstrutil.a +%{_libdir}/libxcpu.a +%{_libdir}/libxauth.a +%{_mandir}/man4/xcpu.4.gz -%files utils -%defattr(0444,root,root) -%attr(0555,root,root) /usr/bin/statfs -%attr(0555,root,root) /usr/bin/xk -%attr(0555,root,root) /usr/bin/xps -%attr(0555,root,root) /usr/bin/xrx -%attr(0555,root,root) /usr/bin/xstat -%attr(0555,root,root) /usr/bin/xgroupset -%attr(0555,root,root) /usr/bin/xuserset -/usr/share/man/man1/xk.1.gz -/usr/share/man/man1/xps.1.gz -/usr/share/man/man1/xrx.1.gz -/usr/share/man/man1/xstat.1.gz -/usr/share/man/man1/xgroupset.1.gz -/usr/share/man/man1/xuserset.1.gz -/usr/share/man/man4/statfs.4.gz +%files xget +%defattr(-,root,root) +%attr(0755,root,root) %{_sbindir}/xget +%{_mandir}/man1/xget.1.gz -%files xbootfs -%defattr(0444,root,root) -%attr(0555,root,root) /usr/sbin/xbootfs -%attr(0755,root,root) /etc/init.d/xbootfs -/usr/share/man/man1/xbootfs.1.gz - %changelog +* Sat Jul 5 2008 Greg Kurtzer <[EMAIL PROTECTED]> +- Repackaged from upstream xcpu for Caos NSA + * Fri Mar 21 2008 Kevin Tegtmeier <[EMAIL PROTECTED]> - Cleaned up files manifest, using more rpm macros Index: misc/xcpu-1.2-multilib.patch =================================================================== --- misc/xcpu-1.2-multilib.patch (revision 0) +++ misc/xcpu-1.2-multilib.patch (revision 0) @@ -0,0 +1,155 @@ +Index: libnpclient/Makefile +=================================================================== +--- libnpclient/Makefile (revision 690) ++++ libnpclient/Makefile (working copy) +@@ -1,4 +1,5 @@ + SYSNAME:=${shell uname} ++MULTILIBPATH=${shell test -d /lib64 && echo lib64 || echo lib} + SYSNAME!=uname + HFILES=../include/npfs.h ../include/npclient.h npcimpl.h + CFLAGS=-Wall -g -I ../include +@@ -24,9 +25,9 @@ + + install: + mkdir -p $(INSTALLPREFIX)/include +- mkdir -p $(INSTALLPREFIX)/lib ++ mkdir -p $(INSTALLPREFIX)/$(MULTILIBPATH) + cp ../include/npclient.h $(INSTALLPREFIX)/include +- cp libnpclient.a $(INSTALLPREFIX)/lib ++ cp libnpclient.a $(INSTALLPREFIX)/$(MULTILIBPATH) + + clean: + rm -f *.o *.a *~ +Index: libnpfs/Makefile +=================================================================== +--- libnpfs/Makefile (revision 690) ++++ libnpfs/Makefile (working copy) +@@ -1,4 +1,5 @@ + SYSNAME:=${shell uname} ++MULTILIBPATH=${shell test -d /lib64 && echo lib64 || echo lib} + SYSNAME!=uname + HFILES=../include/npfs.h npfsimpl.h + CFLAGS=-Wall -g -I../include -D$(SYSNAME) +@@ -30,9 +31,9 @@ + + install: + mkdir -p $(INSTALLPREFIX)/include +- mkdir -p $(INSTALLPREFIX)/lib ++ mkdir -p $(INSTALLPREFIX)/$(MULTILIBPATH) + cp ../include/npfs.h $(INSTALLPREFIX)/include +- cp libnpfs.a $(INSTALLPREFIX)/lib ++ cp libnpfs.a $(INSTALLPREFIX)/$(MULTILIBPATH) + + + clean: +Index: libspclient/Makefile +=================================================================== +--- libspclient/Makefile (revision 690) ++++ libspclient/Makefile (working copy) +@@ -1,4 +1,5 @@ + SYSNAME:=${shell uname} ++MULTILIBPATH=${shell test -d /lib64 && echo lib64 || echo lib} + SYSNAME!=uname + HFILES=../include/spfs.h ../include/spclient.h spcimpl.h + CFLAGS=-Wall -g -I ../include +@@ -28,9 +29,9 @@ + + install: + mkdir -p $(INSTALLPREFIX)/include +- mkdir -p $(INSTALLPREFIX)/lib ++ mkdir -p $(INSTALLPREFIX)/$(MULTILIBPATH) + cp ../include/spclient.h $(INSTALLPREFIX)/include +- cp libspclient.a $(INSTALLPREFIX)/lib ++ cp libspclient.a $(INSTALLPREFIX)/$(MULTILIBPATH) + + clean: + rm -f *.o *.a *~ +Index: libspfs/Makefile +=================================================================== +--- libspfs/Makefile (revision 690) ++++ libspfs/Makefile (working copy) +@@ -1,4 +1,5 @@ + SYSNAME:=${shell uname} ++MULTILIBPATH=${shell test -d /lib64 && echo lib64 || echo lib} + SYSNAME!=uname + HFILES=../include/spfs.h spfsimpl.h + CFLAGS=-Wall -g -I ../include -D$(SYSNAME) +@@ -28,9 +29,9 @@ + + install: + mkdir -p $(INSTALLPREFIX)/include +- mkdir -p $(INSTALLPREFIX)/lib ++ mkdir -p $(INSTALLPREFIX)/$(MULTILIBPATH) + cp ../include/spfs.h $(INSTALLPREFIX)/include +- cp libspfs.a $(INSTALLPREFIX)/lib ++ cp libspfs.a $(INSTALLPREFIX)/$(MULTILIBPATH) + + clean: + rm -f *.o *.a *~ core.* +Index: libstrutil/Makefile +=================================================================== +--- libstrutil/Makefile (revision 690) ++++ libstrutil/Makefile (working copy) +@@ -1,4 +1,5 @@ + SYSNAME:=${shell uname} ++MULTILIBPATH=${shell test -d /lib64 && echo lib64 || echo lib} + SYSNAME!=uname + HFILES=../include/spfs.h ../include/strutil.h + CFLAGS=-Wall -g -I ../include +@@ -15,9 +16,9 @@ + + install: + mkdir -p $(INSTALLPREFIX)/include +- mkdir -p $(INSTALLPREFIX)/lib ++ mkdir -p $(INSTALLPREFIX)/$(MULTILIBPATH) + cp ../include/strutil.h $(INSTALLPREFIX)/include +- cp libstrutil.a $(INSTALLPREFIX)/lib ++ cp libstrutil.a $(INSTALLPREFIX)/$(MULTILIBPATH) + + clean: + rm -f *.o *.a *~ +Index: libxauth/Makefile +=================================================================== +--- libxauth/Makefile (revision 690) ++++ libxauth/Makefile (working copy) +@@ -1,4 +1,5 @@ + SYSNAME:=${shell uname} ++MULTILIBPATH=${shell test -d /lib64 && echo lib64 || echo lib} + SYSNAME!=uname + HFILES=../include/spfs.h ../include/libxauth.h + CFLAGS=-Wall -g -I ../include +@@ -12,9 +13,9 @@ + + install: + mkdir -p $(INSTALLPREFIX)/include +- mkdir -p $(INSTALLPREFIX)/lib ++ mkdir -p $(INSTALLPREFIX)/$(MULTILIBPATH) + cp ../include/libxauth.h $(INSTALLPREFIX)/include +- cp libxauth.a $(INSTALLPREFIX)/lib ++ cp libxauth.a $(INSTALLPREFIX)/$(MULTILIBPATH) + + clean: + rm -f *.o *.a *~ +Index: libxcpu/Makefile +=================================================================== +--- libxcpu/Makefile (revision 690) ++++ libxcpu/Makefile (working copy) +@@ -1,4 +1,5 @@ + SYSNAME:=${shell uname} ++MULTILIBPATH=${shell test -d /lib64 && echo lib64 || echo lib} + SYSNAME!=uname + LIBELFINC=/opt/local/include + HFILES=../include/libxcpu.h xcpuimpl.h ../include/xcpu.h +@@ -24,10 +25,10 @@ + + install: + mkdir -p $(INSTALLPREFIX)/include +- mkdir -p $(INSTALLPREFIX)/lib ++ mkdir -p $(INSTALLPREFIX)/$(MULTILIBPATH) + cp ../include/libxcpu.h $(INSTALLPREFIX)/include + cp ../include/xcpu.h $(INSTALLPREFIX)/include +- cp libxcpu.a $(INSTALLPREFIX)/lib ++ cp libxcpu.a $(INSTALLPREFIX)/$(MULTILIBPATH) + + clean: + rm -f *.o *.a *~ core.*
