X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=3e14f541ac08e272e03db28c09760eb0a59c733a;hb=4792f25a6dfdb2c63404bfafc9292eb600d0b309;hp=068e381231d3dd34a63fe2fb299152db87ebf07d;hpb=8404a0f3da559c3f32b8078fbf5ea317d40785f8;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index 068e381..3e14f54 100755
--- a/build.sh
+++ b/build.sh
@@ -38,8 +38,8 @@ shiftcount=$?
 shift $shiftcount
 
 # expecting fcdistro and pldistro on the command line
-fcdistro=$1; shift
 pldistro=$1; shift
+fcdistro=${pl_DISTRO_NAME}
 
 # Do not tolerate errors
 set -e
@@ -49,16 +49,15 @@ set -e
 # would like to pretend that we are.
 export PL_BOOTCD=1
 
-echo "+++++++++++++pkgsfile=$pkgsfile (and -k)"
-
 # Populate a minimal /dev and then the files for the base bootstrapfs content
 vref=${PWD}/base
 install -d -m 755 ${vref}
 pl_root_makedevs $vref
 
 pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
+echo "--------START BUILDING PlanetLab-Bootstrap: $(date)"
 # -k = exclude kernel* packages
-pl_root_mkfedora -k -f $pkgsfile ${vref} 
+pl_root_mkfedora ${vref} ${pldistro} $pkgsfile
 
 # optionally invoke a post processing script after packages from
 # $pkgsfile have been installed
@@ -67,16 +66,23 @@ pkgsname=$(basename $pkgsfile .pkgs)
 postfile="${pkgsdir}/${pkgsname}.post"
 [ -f $postfile ] && /bin/bash $postfile ${vref} || :
 
+once=1
+
 # for distros that do not define bootstrapfs variants
 pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc -l)
 [ $pkgs_count -gt 0 ] && for pkgs in $(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs); do
     NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
 
-    echo "--------START BUILDING bootstrapfs-${NAME}: $(date)"
+    if [ $once -eq 1 ] ; then
+	once=0
+	echo "--------CREATING PlanetLab-Bootstrap SUBPACKAGES"
+    fi
+
+    echo "--------START BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
 
     # "Parse" out the packages and groups for yum
-    packages=$(pl_getPackages ${pl_DISTRO_NAME} $pkgs)
-    groups=$(pl_getGroups ${pl_DISTRO_NAME} $pkgs)
+    packages=$(pl_getPackages $fcdistro $pldistro $pkgs)
+    groups=$(pl_getGroups $fcdistro $pldistro $pkgs)
     echo "${NAME} has the following packages : ${packages}"
     echo "${NAME} has the following groups : ${groups}"
 
@@ -146,5 +152,6 @@ yum -c ${vref}/etc/yum.conf --installroot=${vref} -y clean all
 echo "--------STARTING tar'ing bootstrapfs-${pldistro}-${pl_DISTRO_ARCH}.tar.bz2: $(date)"
 tar -cpjf bootstrapfs-${pldistro}-${pl_DISTRO_ARCH}.tar.bz2 -C ${vref} .
 echo "--------FINISHED tar'ing bootstrapfs-${pldistro}-${pl_DISTRO_ARCH}.tar.bz2: $(date)"
+echo "--------DONE BUILDING PlanetLab-Bootstrap: $(date)"
 
 exit 0