From 7fbd10b6a19296276fcdca96d1e8b3bd463964d4 Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 4 Dec 2007 16:07:20 +0000
Subject: [PATCH] add in PERSONALITY into BASE name to differentiate between
 32bit and 64bit builds

---
 vbuild-nightly.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 5081d55d..41930450 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -7,7 +7,8 @@ COMMAND=$(basename $0)
 # default values, tunable with command-line options
 DEFAULT_FCDISTRO=fc6
 DEFAULT_PLDISTRO=planetlab
-DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@"
+DEFAULT_PERSONALITY=linux32
+DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
 DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
 
 # NOTE: do not think we want to put email addresses into scripts
@@ -200,7 +201,7 @@ function main () {
     MAKEOPTS=()
     DO_BUILD=true
     DO_TEST=true
-    PERSONALITY="linux32"
+    PERSONALITY=$DEFAULT_PERSONALITY
     while getopts "nf:d:b:t:r:s:om:a:w:BTvhp:" opt ; do
 	case $opt in
 	    n) DRY_RUN="true" ; MAKEOPTS=(${MAKEOPTS[@]} -n) ;;
@@ -242,7 +243,7 @@ function main () {
     [ -n "$DRY_RUN" ] && MAILTO=""
 	
     ### set BASE from DISTRO, if unspecified
-    sedargs="-e s,@DATE@,${DATE},g -e s,@FCDISTRO@,${FCDISTRO},g -e s,@PLDISTRO@,${PLDISTRO},g"
+    sedargs="-e s,@DATE@,${DATE},g -e s,@FCDISTRO@,${FCDISTRO},g -e s,@PLDISTRO@,${PLDISTRO},g -e s,@PERSONALITY@,${PERSONALITY},g"
     BASE=$(echo ${BASE} | sed $sedargs)
     WEBPATH=$(echo ${WEBPATH} | sed $sedargs)
 
-- 
2.47.0