X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=8bfbb5a57bbb73adf608614849bd5624ede5bec8;hb=a26df2ba741f55e6eb1fb0003a798959ba624090;hp=f02a928a271d9fc61b65bce97bf3c58241a5c0f5;hpb=9606a8cc35143d8d8aee4e627183562a39c28596;p=bootstrapfs.git diff --git a/build.sh b/build.sh index f02a928..8bfbb5a 100755 --- a/build.sh +++ b/build.sh @@ -63,7 +63,7 @@ pl_root_mkfedora ${vref} ${pldistro} $pkgsfile pkgsdir=$(dirname $pkgsfile) pkgsname=$(basename $pkgsfile .pkgs) postfile="${pkgsdir}/${pkgsname}.post" -[ -f $postfile ] && /bin/bash $postfile ${vref} || : +[ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vref} || : ; } displayed="" @@ -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 ${pldistro}-filesystems/$extension_plain > ${pldistro}-filesystems/$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