X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=8bfbb5a57bbb73adf608614849bd5624ede5bec8;hb=a26df2ba741f55e6eb1fb0003a798959ba624090;hp=4147a535883c7931b86b44bfdfdca41fb51a918e;hpb=1f3a01582150b0e3e8a39210d1b6b82f83c23b43;p=bootstrapfs.git diff --git a/build.sh b/build.sh index 4147a53..8bfbb5a 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,6 @@ #!/bin/bash # -# Build PlanetLab-Bootstrap.tar.bz2, the reference image for PlanetLab -# nodes. +# Build bootstrapfs-*.tar.bz2, the reference image(s) for PlanetLab nodes. # # Mark Huang # Marc E. Fiuczynski @@ -10,9 +9,8 @@ # $Id: buildnode.sh,v 1.12.6.1 2007/08/30 20:09:20 mef Exp $ # - # -# This will build the Planetlab-Bootstrap.tar.bz2, which comprises +# This will build the bootstrafs-*.tar.bz2 images, which comprises # the base root image on the node, then create the ${NAME} bootstrap image # which is made up of just the additional files needed for a ${NAME} nodegroup # node. @@ -20,14 +18,13 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -# In both a normal CVS environment and a PlanetLab RPM -# build environment, all of our dependencies are checked out into -# directories at the same level as us. +# in the PlanetLab build environment, our dependencies are checked out +# into directories at the same level as us. if [ -d ../build ] ; then PATH=$PATH:../build srcdir=../ else - echo "Error: Could not find $(cd ../.. && pwd -P)/build/" + echo "Error: Could not find ../build in $(pwd)" exit 1 fi @@ -39,9 +36,9 @@ pl_process_fedora_options $@ shiftcount=$? shift $shiftcount -# pldistro expected as $1 - defaults to planetlab -pldistro=planetlab -[ -n "$@" ] && pldistro=$1 +# expecting fcdistro and pldistro on the command line +pldistro=$1; shift +fcdistro=${pl_DISTRO_NAME} # Do not tolerate errors set -e @@ -51,31 +48,41 @@ 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 PlanetLab-Bootstrap content +# 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 "* Building Bootstrapfs for ${pldistro}: $(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 +pkgsdir=$(dirname $pkgsfile) +pkgsname=$(basename $pkgsfile .pkgs) +postfile="${pkgsdir}/${pkgsname}.post" +[ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vref} || : ; } -postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post) -[ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vref} || : +displayed="" # for distros that do not define bootstrapfs variants -shopt -s nullglob 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 PlanetLab-Bootstrap-${NAME}: $(date)" + [ -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)" # "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}" @@ -88,16 +95,20 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc rm -f ${vdir}/var/lib/rpm/__db* # Install the system vserver specific packages - [ -n "$packages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $packages - [ -n "$groups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $groups + [ -n "$packages" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y install $packages + [ -n "$groups" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall $groups if [ -f "${vdir}/proc/cpuinfo" ] ; then echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!" umount ${vdir}/proc fi - postfile=$(echo $pkgs | sed -e s,pkgs,post, ) - [ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vref} || : + # 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} || : # Create a copy of the ${NAME} bootstrap filesystem w/o the base @@ -105,7 +116,7 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc # process: # step 1: clean out yum cache to reduce space requirements - yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y clean all + yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y clean all # step 2: figure out the new/changed files in ${vdir} vs. ${vref} and compute ${vdir}.changes rsync -anv ${vdir}/ ${vref}/ > ${vdir}.changes @@ -128,18 +139,23 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc rm -f ${vdir}.changes mv ${vdir}-tmp ${vdir} - echo "--------STARTING tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)" - tar -cpjf ${pldistro}-filesystems/PlanetLab-Bootstrap-${NAME}.tar.bz2 -C ${vdir} . - echo "--------FINISHED tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)" - echo "--------DONE BUILDING PlanetLab-Bootstrap-${NAME}: $(date)" + echo -n "* tar $extension_name s=$(date +%H-%M-%S)" + 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 # Build the base Bootstrap filesystem # clean out yum cache to reduce space requirements -yum -c ${vref}/etc/yum.conf --installroot=${vdir} -y clean all - -echo "--------STARTING tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)" -tar -cpjf PlanetLab-Bootstrap.tar.bz2 -C ${vref} . -echo "--------FINISHED tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)" +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 -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