deprecate the BootstrapRPM tarball, build and install all other tarballs until v2...

diff --git a/bootmanager.spec b/bootmanager.spec
index 248b3f0..4268607 100644 (file)
--- a/bootmanager.spec
+++ b/bootmanager.spec
@@ -25,12 +25,17 @@ nodes.
 
 %build
 ./build.sh
 
 %build
 ./build.sh

-make -C support-files PlanetLab-Bootstrap.tar.bz2
+make -C support-files

 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -D -m 755 bootmanager.sh $RPM_BUILD_ROOT/var/www/html/boot/bootmanager.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -D -m 755 bootmanager.sh $RPM_BUILD_ROOT/var/www/html/boot/bootmanager.sh

-install -D -m 644 support-files/PlanetLab-Bootstrap.tar.bz2 $RPM_BUILD_ROOT/var/www/html/boot/PlanetLab-Bootstrap.tar.bz2
+for tarball in \
+    alpina-BootLVM.tar.gz \
+    alpina-PartDisks.tar.gz \
+    PlanetLab-Bootstrap.tar.bz2 ; do
+  install -D -m 644 support-files/$tarball $RPM_BUILD_ROOT/var/www/html/boot/$tarball
+done

 
 # If run under sudo, allow user to delete the build directory
 if [ -n "$SUDO_USER" ] ; then
 
 # If run under sudo, allow user to delete the build directory
 if [ -n "$SUDO_USER" ] ; then


@@ -53,8 +58,7 @@ EOF
 
 %files
 %defattr(-,root,root,-)
 
 %files
 %defattr(-,root,root,-)

-/var/www/html/boot/bootmanager.sh
-/var/www/html/boot/PlanetLab-Bootstrap.tar.bz2
+/var/www/html/boot/*

 
 %changelog
 * Fri Sep  2 2005 Mark Huang <mlhuang@cotton.CS.Princeton.EDU> - 
 
 %changelog
 * Fri Sep  2 2005 Mark Huang <mlhuang@cotton.CS.Princeton.EDU> - 

diff --git a/support-files/Makefile b/support-files/Makefile
index 3ea3daf..1d9e99e 100644 (file)
--- a/support-files/Makefile
+++ b/support-files/Makefile
@@ -7,10 +7,10 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #

-# $Id$
+# $Id: Makefile,v 1.2 2005/09/02 19:09:33 mlhuang Exp $

 # 
 
 # 
 

-all:   alpina-BootLVM.tar.gz alpina-BootstrapRPM.tar.gz alpina-PartDisks.tar.gz PlanetLab-Bootstrap.tar.bz2
+all:   alpina-BootLVM.tar.gz alpina-PartDisks.tar.gz PlanetLab-Bootstrap.tar.bz2

 
 alpina-BootLVM.tar.gz:
        ./buildsupport.sh build BootLVM
 
 alpina-BootLVM.tar.gz:
        ./buildsupport.sh build BootLVM