From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 21 Nov 2007 08:46:20 +0000 (+0000)
Subject: simpler bootstrap : take the whole build
X-Git-Tag: 4.2-rc2~500
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9ec895047155840da75dfda900ddc559acae3240;p=build.git

simpler bootstrap : take the whole build
---

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index d1aecfd2..6d11e731 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -275,20 +275,16 @@ function main () {
 	    echo "XXXXXXXXXX $COMMAND: creating vserver $BASE" $(date)
 	    show_env
 
-	    ### extract vbuild-init-vserver.sh and run it
-	    svn cat $SVNPATH/vbuild-init-vserver.sh > /tmp/vbuild-init-vserver-$$.sh
-	    # get .lst 
-	    lst=${PLDISTRO}-devel.lst
-	    svn cat $SVNPATH/$lst > /tmp/$lst 
-
+	    ### extract the whole build - much simpler
+	    tmpdir=$(mktemp /tmp/$COMMAND.XXXXXX)
+	    svn export $SVNPATH $tmpdir
             # Create vserver
-	    cd /tmp
-	    chmod +x vbuild-init-vserver-$$.sh
-	    /tmp/vbuild-init-vserver-$$.sh ${BASE} ${FCDISTRO} ${PLDISTRO}
+	    cd $tmpdir
+	    ./vbuild-init-vserver.sh ${BASE} ${FCDISTRO} ${PLDISTRO}
 	    # cleanup
-	    rm -f /tmp/vbuild-init-vserver-$$.sh /tmp/$lst
 	    cd -
-	    # Extract build
+	    rm -f $tmpdir
+	    # Extract build again - in the vserver
 	    vserver ${BASE} exec svn export ${SVNPATH} /build
 	fi
 	echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date)