From d4a1143c080fe558b043895dd721efa8f7b3b8d0 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 24 Nov 2008 17:22:00 +0000
Subject: [PATCH] the new bootstrapfs-*-plain rpm has uncompressed bootstrapfs
 images (for tests)

---
 bootstrapfs.spec | 14 ++++++++++++++
 build.sh         | 10 ++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/bootstrapfs.spec b/bootstrapfs.spec
index f339419..650ca05 100644
--- a/bootstrapfs.spec
+++ b/bootstrapfs.spec
@@ -39,6 +39,12 @@ AutoReqProv: no
 The PlanetLab Bootstrap Filesystem(s) are downloaded by the
 BootManager to instantiate a node with a new filesystem.
 
+%package plain
+Summary: The (uncompressed) PlanetLab Bootstrap Filesystems for %{nodefamily}
+Group: System Environment/Base
+%description plain
+This package provides the same functions as %{name} but with uncompressed tarball for faster tests.
+
 %prep
 %setup -q
 
@@ -55,11 +61,15 @@ arch=$(uname -i)
 
 install -D -m 644 bootstrapfs-%{pldistro}-${arch}.tar.bz2 \
 	$RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-%{pldistro}-${arch}.tar.bz2
+install -D -m 644 bootstrapfs-%{pldistro}-${arch}.tar \
+	$RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-%{pldistro}-${arch}.tar
 
 for pkgs in $(ls ../build/config.%{pldistro}/bootstrapfs-*.pkgs) ; do 
     NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
     install -D -m 644 %{pldistro}-filesystems/bootstrapfs-${NAME}-${arch}.tar.bz2 \
 		$RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-${NAME}-${arch}.tar.bz2 
+    install -D -m 644 %{pldistro}-filesystems/bootstrapfs-${NAME}-${arch}.tar \
+		$RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-${NAME}-${arch}.tar 
 done
 
 popd
@@ -84,6 +94,10 @@ fi
 %defattr(-,root,root,-)
 /var/www/html/boot/bootstrapfs*.tar.bz2
 
+%files plain
+%defattr(-,root,root,-)
+/var/www/html/boot/bootstrapfs*.tar
+
 %changelog
 * Fri Nov 14 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-1.0-4
 - cosmetic changes in build: displays duration, and shows up in summary
diff --git a/build.sh b/build.sh
index f02a928..49b20f0 100755
--- a/build.sh
+++ b/build.sh
@@ -75,6 +75,7 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc
     [ -z "$displayed" ] && echo "* Handling ${plistro} bootstrapfs extensions"
     displayed=true
 
+    extension_plain=bootstrapfs-${NAME}-${pl_DISTRO_ARCH}.tar
     extension_name=bootstrapfs-${NAME}-${pl_DISTRO_ARCH}.tar.bz2
 
     echo "* Start Building $extension_name: $(date)"
@@ -139,7 +140,9 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc
     mv ${vdir}-tmp ${vdir}
     
     echo -n "* tar $extension_name s=$(date +%H-%M-%S)"
-    tar -cpjf ${pldistro}-filesystems/$extension_name -C ${vdir} .
+    tar -cpf ${pldistro}-filesystems/$extension_plain -C ${vdir} .
+    echo -n " m=$(date +%H-%M-%S) "
+    bzip2 --compress --stdout $extension_plain > $extension_name
     echo " e=$(date +%H-%M-%S) "
 done
 
@@ -147,9 +150,12 @@ done
 # clean out yum cache to reduce space requirements
 yum -c ${vref}/etc/mkfedora-yum.conf --installroot=${vref} -y clean all
 
+bootstrapfs_plain=bootstrapfs-${pldistro}-${pl_DISTRO_ARCH}.tar
 bootstrapfs_name=bootstrapfs-${pldistro}-${pl_DISTRO_ARCH}.tar.bz2
 echo -n "* tar $bootstrapfs_name s=$(date +%H-%M-%S)"
-tar -cpjf $bootstrapfs_name -C ${vref} .
+tar -cpf $bootstrapfs_plain -C ${vref} .
+echo -n " m=$(date +%H-%M-%S) "
+bzip2 --compress --stdout $bootstrapfs_plain > $bootstrapfs_name
 echo " e=$(date +%H-%M-%S) "
 
 exit 0
-- 
2.43.0