Thanks, Josh!
Thus spake Josh Aas ([EMAIL PROTECTED]):
I've attached a patch that gets the rpm build system working out of CVS. Right now, "make rpm" or "make srpm" fails, but this patch fixes it. Having this working again makes testing with RPMs during development easier.
If you apply this patch to the cvs tree then do "make srpm", install the generated srpm, then try to build the binary RPMs from it, the build will fail. That is because of a problem with the way busybox is compiled right now, and isn't related to this patch. I will post a patch to fix the busybox problem soon.
-- Josh Aas Linux System Software Silicon Graphics, Inc. (SGI)
Index: Makefile =================================================================== RCS file: /cvsroot/systemimager/systemimager/Makefile,v retrieving revision 1.170 diff -u -r1.170 Makefile --- Makefile 24 Oct 2004 05:23:29 -0000 1.170 +++ Makefile 10 Dec 2004 08:34:17 -0000 @@ -611,12 +611,12 @@ # make the srpms for systemimager .PHONY: srpm srpm: $(TOPDIR)/tmp/systemimager-$(VERSION).tar.bz2 - rpm -ts $(TOPDIR)/tmp/systemimager-$(VERSION).tar.bz2 + rpmbuild -ts $(TOPDIR)/tmp/systemimager-$(VERSION).tar.bz2
# make the rpms for systemimager .PHONY: rpm rpm: $(TOPDIR)/tmp/systemimager-$(VERSION).tar.bz2 - rpm -tb $(TOPDIR)/tmp/systemimager-$(VERSION).tar.bz2 + rpmbuild -tb $(TOPDIR)/tmp/systemimager-$(VERSION).tar.bz2
# removes object files, docs, editor backup files, etc. .PHONY: clean Index: systemimager.spec =================================================================== RCS file: /cvsroot/systemimager/systemimager/systemimager.spec,v retrieving revision 1.58 diff -u -r1.58 systemimager.spec --- systemimager.spec 2 Jun 2004 20:14:06 -0000 1.58 +++ systemimager.spec 10 Dec 2004 08:34:17 -0000 @@ -1,5 +1,5 @@ %define name systemimager -%define ver 3.3.1 +%define ver 3.5.00 %define rel 1 %define prefix /usr %define _build_all 1 @@ -462,8 +462,8 @@
%files common %defattr(-, root, root) -%prefix/bin/lsimage -%prefix/share/man/man8/lsimage* +%prefix/bin/si_lsimage +%prefix/share/man/man8/si_lsimage* %prefix/share/man/man5/autoinstall* %dir %prefix/lib/systemimager %prefix/lib/systemimager/perl/SystemImager/Common.pm @@ -495,27 +495,27 @@ /var/lib/systemimager/images/* /var/lib/systemimager/scripts/post-install/* /var/lib/systemimager/scripts/pre-install/* -%prefix/sbin/addclients -%prefix/sbin/cpimage -%prefix/sbin/getimage -%prefix/sbin/mk* -%prefix/sbin/mvimage -%prefix/sbin/netbootmond -%prefix/sbin/pushupdate -%prefix/sbin/rmimage -%prefix/sbin/imagemanip -%prefix/bin/mkautoinstall* +%prefix/sbin/si_addclients +%prefix/sbin/si_cpimage +%prefix/sbin/si_getimage +%prefix/sbin/si_mk* +%prefix/sbin/si_mvimage +%prefix/sbin/si_netbootmond +%prefix/sbin/si_pushupdate +%prefix/sbin/si_rmimage +%prefix/sbin/si_imagemanip +%prefix/bin/si_mkautoinstall* %prefix/lib/systemimager/perl/SystemImager/Server.pm %prefix/lib/systemimager/perl/SystemImager/Config.pm %prefix/lib/systemimager/perl/confedit %prefix/share/man/man5/systemimager* -%prefix/share/man/man8/addclients* -%prefix/share/man/man8/cpimage* -%prefix/share/man/man8/getimage* -%prefix/share/man/man8/mk* -%prefix/share/man/man8/mvimage* -%prefix/share/man/man8/rmimage* -%prefix/share/man/man8/pushupdate* +%prefix/share/man/man8/si_addclients* +%prefix/share/man/man8/si_cpimage* +%prefix/share/man/man8/si_getimage* +%prefix/share/man/man8/si_mk* +%prefix/share/man/man8/si_mvimage* +%prefix/share/man/man8/si_rmimage* +%prefix/share/man/man8/si_pushupdate*
%files client %defattr(-, root, root) @@ -523,10 +523,10 @@ %dir /etc/systemimager %config /etc/systemimager/updateclient.local.exclude %config /etc/systemimager/client.conf -%prefix/sbin/updateclient -%prefix/sbin/prepareclient -%prefix/share/man/man8/updateclient* -%prefix/share/man/man8/prepareclient* +%prefix/sbin/si_updateclient +%prefix/sbin/si_prepareclient +%prefix/share/man/man8/si_updateclient* +%prefix/share/man/man8/si_prepareclient* %prefix/lib/systemimager/perl/SystemImager/Client.pm
%files flamethrower
--
------------------------------------------------------
Brian Elliott Finley Argonne, MCS Division Office: 630.252.4742 Mobile: 630.631.6621
gpg --keyserver wwwkeys.pgp.net --recv-keys 10F8EE52
------------------------------------------------------
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. http://productguide.itmanagersjournal.com/
_______________________________________________
Sisuite-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/sisuite-devel
