svn:keywords

[bootstrapfs.git] / build.sh

diff --git a/build.sh b/build.sh
index f02a928..ee89cdf 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -6,7 +6,7 @@
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2005-2007 The Trustees of Princeton University
 #
-# $Id: buildnode.sh,v 1.12.6.1 2007/08/30 20:09:20 mef Exp $
+# $Id$
 #
 
 #
@@ -60,10 +60,8 @@ pl_root_mkfedora ${vref} ${pldistro} $pkgsfile
 
 # optionally invoke a post processing script after packages from
 # $pkgsfile have been installed
-pkgsdir=$(dirname $pkgsfile)
-pkgsname=$(basename $pkgsfile .pkgs)
-postfile="${pkgsdir}/${pkgsname}.post"
-[ -f $postfile ] && /bin/bash $postfile ${vref} || :
+postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post)
+[ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vref} || : ; }
 
 displayed=""
 
@@ -75,6 +73,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)"
@@ -104,11 +103,8 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc
 
     # optionally invoke a post processing script after packages from
     # $pkgs have been installed
-    pkgsdir=$(dirname $pkgs)
-    pkgsname=$(basename $pkgs .pkgs)
-    postfile="${pkgsdir}/${pkgsname}.post"
-    [ -f $postfile ] && /bin/bash $postfile ${vdir} || :
-
+    postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs-${NAME}.post)
+    [ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vdir} || : ; }
 
     # Create a copy of the ${NAME} bootstrap filesystem w/o the base
     # bootstrap filesystem and make it smaller.  This is a three step
@@ -139,7 +135,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 ${pldistro}-filesystems/$extension_plain > ${pldistro}-filesystems/$extension_name
     echo " e=$(date +%H-%M-%S) "
 done
 
@@ -147,9 +145,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