Commits

M0E-lnx  committed f20177d

Fix typo in jailedbuild.real... update slaves

  • Participants
  • Parent commits 50c7aad

Comments (0)

Files changed (2)

File slave/usr/local/bin/jailedbuild.real

 source /etc/vlbuildslave/slavehost.conf || exit 1
 
 export BUILDER=${BUILDER:-"$1"}
-export APPNAME=$BUILDER
-export TARGET_VL=${TARGET_VL:-"$(branch_to_vlrelease $2)"} # should be something like 7p0 or 7p1
+if [[ "$BUILDER" == *~x86_64 ]]; then
+	export APPNAME=$(echo $BUILDER |cut -f 1 -d "~")
+else
+	export APPNAME=$BUILDER
+fi
+TARGET_VL=${TARGET_VL:-"$(branch_to_vlrelease $2)"} # should be something like 7p0 or 7p1
 export REPOBRANCH=${REPOBRANCH:-"veclinux-$(echo $TARGET_VL|sed 's|p|.|g')"}
-export TARGET_ARCH=${TARGET_ARCH:-"$(get_arch_for_builder $BUILDER)"}
+TARGET_ARCH=${TARGET_ARCH:-"$(get_arch_for_builder $BUILDER)"}
 
 case $TARGET_ARCH in
-	"64"|"x86_64")
-		TARGET_ARCH="64"
+	64|x86_64)
+		export TARGET_ARCH="64"
 		USE_ARCH="x86_64"
-		APPNAME=$(echo $BUILDER | cut -f 1 -d "~")
 		;;
-	"32"|"i?86")
-		TARGET_ARCH="32"
+	32|i[3456]86|x86)
+		export TARGET_ARCH="32"
 		USE_ARCH="i586"
 		;;
 esac

File updated/update.conf

 #    an update to the slaves.  the function name MUST remain the same and the so must 
 #    everythin else.  The rest of the update system looks for this function.
 
-REMOTEVERSION=20130515
+REMOTEVERSION=20130515a
 CONF=/etc/vlbuildslave/slavehost.conf
 BKCONF=/etc/vlbuildslave/slavehost.conf.backup
 LOGFILE=/var/log/vlbuildbot-updated.log