Commits

M0E-lnx  committed 8bd7eec

More tweaks at build and upload scripts

  • Participants
  • Parent commits e855e03

Comments (0)

Files changed (3)

File slave/usr/local/bin/build-pusher

 trap "rm -rf $LOCKFILE; exit" INT TERM EXIT
 
 BUILDER=${BUILDER:-"$1"}
+export REPOBRANCH=${REPOBRANCH:-"$2"} # must be like 'veclinux-7.1'
+export TARGET_VL=${TARGET_VL:-"$(branch_to_vlrelease $REPOBRANCH)"}
+
+
 if [[ "$BUILDER" == *~x86_64 ]]; then
 	export APPNAME=$(echo $BUILDER |cut -f1 -d "~")
 else
 	export APPNAME=$BUILDER
 fi
-TARGET_VL=${TARGET_VL:-"$(branch_to_vlrelease $2)"}
 TARGET_ARCH=${TARGET_ARCH:-"$(get_arch_for_builder $BUILDER)"}
-
 case $TARGET_ARCH in
 	64|x86_64)
 		pooldir="x86_64"
 	exit 1
 fi
 
-echo "$Upload packages from $WORKPATH"
+echo "Upload packages from $WORKPATH"
 make_links_txt(){
 
 # cd $WORKDIR/$APPNAME/src || exit 1

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

 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')"}
-TARGET_ARCH=${TARGET_ARCH:-"$(get_arch_for_builder $BUILDER)"}
+export TARGET_ARCH=${TARGET_ARCH:-"$(get_arch_for_builder $BUILDER)"}
+export TARGET_VL=${TARGET_VL:-"$(branch_to_vlrelease $REPOBRANCH)"} # Must be something like 7p1
 
 case $TARGET_ARCH in
 	64|x86_64)

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=20130515b
+REMOTEVERSION=20130515c
 CONF=/etc/vlbuildslave/slavehost.conf
 BKCONF=/etc/vlbuildslave/slavehost.conf.backup
 LOGFILE=/var/log/vlbuildbot-updated.log
 ( cd $REPO/slave/usr/local/bin
 	chmod +x *
 	cp * /usr/local/bin
- cd $REPO/etc/rc.d
- 	cp rc.vlbuildslave-update /etc/rc.d/
-	chmod +x /etc/rc.d/rc.vlbuildslave-update
 	)