svn commit: r283594 - user/gjb/thermite

[Glen Barber]

Author: gjb
Date: Wed May 27 01:04:44 2015
New Revision: 283594
URL: https://svnweb.freebsd.org/changeset/base/283594

Log:
  Re-sync with RE repository:
  
  - Only run ftp_stage() if EVERYTHINGISFINE variable is set,
    as an anti-foot-shooting measure.
  - rsync(1) output from 'ftp-stage' target to a main directory
    on the build host, defined by ftpdir, in ftp_stage().
  - Create 'ftpdir' before rsync(1).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Tue May 26 21:58:22 2015	(r283593)
+++ user/gjb/thermite/thermite.sh	Wed May 27 01:04:44 2015	(r283594)
@@ -247,6 +247,7 @@ ftp_stage() {
 	_build="${rev}-${arch}-${kernel}-${type}"
 	_conf="${scriptdir}/${_build}.conf"
 	source_config || return 0
+	[ -z "${EVERYTHINGISFINE}" ] && return 0
 
 	load_stage_env
 	info "Staging for ftp: ${_build}"
@@ -262,6 +263,15 @@ ftp_stage() {
 		KERNCONF=${KERNEL} \
 		ftp-stage >> ${logdir}/${_build}.log 2>&1
 
+	if [ -z "${ftpdir}" ]; then
+		info "FTP directory (ftpdir) not set."
+		info "Refusing to rsync(1) to the stage area."
+		return 0
+	fi
+
+	mkdir -p "${ftpdir}/${type}"
+	rsync -avH ${CHROOTDIR}/R/ftp-stage/${type}/* \
+		${ftpdir}/${type}/
 	unset BOARDNAME BUILDDATE EMBEDDEDBUILD SVNREVISION
 	unset _build _conf
 	return 0