typo in BootstrapFS dependency

[build.git] / build.sh

diff --git a/build.sh b/build.sh
index d8d04c4..0eaa02f 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -7,28 +7,27 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id: build.sh,v 1.33 2006/03/16 16:38:43 mlhuang Exp $
+# $Id: build.sh,v 1.43 2007/02/01 16:03:33 mlhuang Exp $
 #
 
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 # Set defaults
-CVSROOT=:pserver:anon@cvs.planet-lab.org:/cvs
-CVS_RSH=ssh
+SVNPATH=https://svn.planet-lab.org/svn
+TAG=trunk
 MODULE=build
-TAG=HEAD
 BASE=$PWD
 PLDISTRO=planetlab
+VSERVER=
 
 # cron does not set USER?
 [ -z "$USER" ] && export USER=$LOGNAME
 
-# Export certain variables
-export CVS_RSH
-
 # Get options
-while getopts "d:r:m:f:b:x:h" opt ; do
+while getopts "d:r:m:f:b:x:v:h" opt ; do
     case $opt in
        d)
-           CVSROOT=$OPTARG
+           SVNPATH=$OPTARG
            ;;
        r)
            TAG=$OPTARG
@@ -45,10 +44,14 @@ while getopts "d:r:m:f:b:x:h" opt ; do
        x)
            BUILDS=$OPTARG
            ;;
+       v)
+           VSERVER=$OPTARG
+           ;;
        h|*)
            echo "usage: `basename $0` [OPTION]..."
-           echo "      -d directory    CVS repository root (default $CVSROOT)"
-           echo "      -r revision     CVS revision to checkout (default $TAG)"
+           echo "      -d directory    SVN repository root (default $SVNPATH)"
+           echo "      -r revision     SVN revision to checkout (default $TAG)"
+           echo "      -v Vserver      Vserver reference to build within (optional)"
            echo "      -m address      Notify recipient of failures (default: none)"
            echo "      -f distro       Distribution to build (default: $PLDISTRO)"
            echo "      -b base         Run operations in specified base directory (default $BASE)"
@@ -62,6 +65,7 @@ shift $(($OPTIND - 1))
 # Base operations in specified directory
 mkdir -p $BASE
 cd $BASE || exit $?
+BASEDIR=$(pwd)
 
 # Remove old runs
 if [ -n "$BUILDS" ] ; then
@@ -69,7 +73,8 @@ if [ -n "$BUILDS" ] ; then
 fi
 
 # Create a unique build base
-BASE=${TAG/HEAD/`date +%Y.%m.%d`}
+BASE=build_${TAG/trunk/`date +%Y.%m.%d`}
+[ -n "${VSERVER}" ] && BASE=${VSERVER}_${BASE}
 i=
 while ! mkdir ${BASE}${i} 2>/dev/null ; do
     [ -z ${i} ] && BASE=${BASE}.
@@ -85,18 +90,64 @@ BASE=${BASE}${i}
 exec 2>&1
 exec &>${BASE}/log
 
-# Build
-cvs -d ${CVSROOT} export -r ${TAG} -d ${BASE} ${MODULE}
-make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} && \
-make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} install BASE=$BASE BUILDS=$BUILDS
-rc=$?
-
-if [ $rc -ne 0 ] ; then
+failure() {
     # Notify recipient of failure
     if [ -n "$MAILTO" ] ; then
        tail -c 8k ${BASE}/log | mail -s "Failures for ${BASE}" $MAILTO
     fi
-    exit $rc
+    exit 1
+}
+
+vfailure() {
+    # Notify recipient of failure
+    vnamespace -e $BASE umount ${BASEDIR}/${BASE}/data
+    vserver $BASE stop
+    vserver --silent $BASE delete
+    failure
+    exit 1
+}
+
+trap failure ERR INT
+
+set -x
+
+VCMDPREFIX=
+if [ -n "$VSERVER" ] ; then
+    vserver $BASE build -m clone --rootdir ${BASEDIR} -- --source /vservers/${VSERVER}
+    vserver $BASE start
+    trap vfailure ERR INT
+    if [ -d /data ] ; then
+       vnamespace -e $BASE mount -o ro --bind /data ${BASEDIR}/${BASE}/data
+    fi
+
+    # Checkout build directory
+    VSUEXEC="vserver $BASE exec su - build -c"
+
+    $VSUEXEC "svn checkout ${SVNPATH}/${MODULE}/${TAG} ${MODULE}"
+
+    # Build
+    #XXX vserver $BASE suexec build ${MODULE}/make.sh TAG=${TAG} PLDISTRO=${PLDISTRO}
+
+    # Install to boot server
+    # XXX not yet
+
+    trap - ERR INT
+    vnamespace -e $BASE umount ${BASEDIR}/${BASE}/data
+    vserver $BASE stop
+else
+    # Checkout build directory
+    svn checkout ${SVNPATH}/${MODULE}/${TAG} ${BASE}
+
+    # Build myplc-devel-native, install it to ensure we've got the right packages, and let it rip
+    make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} BASE=$BASE BUILDS=$BUILDS MyPLC-devel-native
+    sudo yum -y localinstall RPMS/i386/MyPLC-devel-native-*.*.rpm 
+
+    # Build everything
+    make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} BASE=$BASE BUILDS=$BUILDS
+
+    # Install to boot server
+    # XXX not yet
+    #make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} install BASE=$BASE BUILDS=$BUILDS
 fi
 
 exit 0