X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootcd.spec;h=c14816ef20c30f3ec41ea227362ac151e978d37d;hb=9f3015d28f2cf5907c603197818769b9f758b205;hp=45c4f84d3a49ed328a18fd37fbb550c9752253a3;hpb=91605e8f5627537438a2f026ca49134b9e33a9f8;p=bootcd.git

diff --git a/bootcd.spec b/bootcd.spec
index 45c4f84..c14816e 100644
--- a/bootcd.spec
+++ b/bootcd.spec
@@ -1,6 +1,6 @@
 %define name bootcd
-%define version 3.2
-%define release 1.planetlab%{?date:.%{date}}
+%define version 3.3
+%define release 1%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 # XXX Get this from /etc/planetlab
 %define configuration default
 
@@ -34,20 +34,29 @@ environment.
 %install
 install -d $RPM_BUILD_ROOT/var/www/html/download
 pushd build/%{configuration}
+rm -f $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.md5
 bzip2 -c PlanetLab-BootCD-%{version}.iso > \
     $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.iso.bz2
+md5sum $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.iso.bz2 >> \
+	$RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.md5
+
 bzip2 -c PlanetLab-BootCD-%{version}.usb > \
     $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.usb.bz2
-md5sum PlanetLab-BootCD-%{version}.{iso,usb} >> \
-    $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.md5
-cd $RPM_BUILD_ROOT/var/www/html/download/
-md5sum PlanetLab-BootCD-%{version}.{iso,usb}.bz2 >> \
-    PlanetLab-BootCD-%{version}.md5
+md5sum $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.usb.bz2 >> \
+	$RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.md5
+
+bzip2 -c PlanetLab-BootCD-%{version}-biginitrd.usb > \
+    $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}-biginitrd.usb.bz2
+md5sum $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}-biginitrd.usb.bz2 >> \
+	$RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.md5
 popd
     
 # If run under sudo, allow user to delete the build directory
 if [ -n "$SUDO_USER" ] ; then
     chown -R $SUDO_USER .
+    # Some temporary cdroot files like /var/empty/sshd and
+    # /usr/bin/sudo get created with non-readable permissions.
+    find . -not -perm +0600 -exec chmod u+rw {} \;
 fi
 
 %clean
@@ -69,9 +78,13 @@ EOF
 %defattr(-,root,root,-)
 /var/www/html/download/PlanetLab-BootCD-%{version}.iso.bz2
 /var/www/html/download/PlanetLab-BootCD-%{version}.usb.bz2
+/var/www/html/download/PlanetLab-BootCD-%{version}-biginitrd.usb.bz2
 /var/www/html/download/PlanetLab-BootCD-%{version}.md5
 
 %changelog
+* Mon Jan 29 2006 Marc E. Fiuczynski <mef@cs.princeton.edu> - 
+- added biginitrd usb image
+
 * Fri Sep  2 2005 Mark Huang <mlhuang@cotton.CS.Princeton.EDU> - 
 - Initial build.