svn commit: r283649 - user/gjb/thermite

[Glen Barber]

Author: gjb
Date: Thu May 28 15:58:41 2015
New Revision: 283649
URL: https://svnweb.freebsd.org/changeset/base/283649

Log:
  Re-sync with the RE repository:
   In build_ec2_ami(), fix AWSKEYFILE evaluation, use
   the correct src tree path for the 'ec2ami' target,
   and redirect stderr to stdout.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Thu May 28 14:24:21 2015	(r283648)
+++ user/gjb/thermite/thermite.sh	Thu May 28 15:58:41 2015	(r283649)
@@ -314,15 +314,15 @@ build_ec2_ami() {
 			return 0
 		fi
 	fi
-	if [ -z "${AWSREGION}" -o -z "${AWSBUCKET}" -o "${AWSKEYFILE}" ]; then
+	if [ -z "${AWSREGION}" -o -z "${AWSBUCKET}" -o -z "${AWSKEYFILE}" ]; then
 		return 0
 	fi
-	chroot ${CHROOTDIR} make -C /usr/src \
+	chroot ${CHROOTDIR} make -C /usr/src/release \
 		AWSREGION=${AWSREGION} \
 		AWSBUCKET=${AWSBUCKET} \
 		AWSKEYFILE=${AWSKEYFILE} \
 		EC2PUBLIC=${EC2PUBLIC} ec2ami \
-		>> ${logdir}/${_build}.log
+		>> ${logdir}/${_build}.log 2>&1
 	unset _build _conf AWSREGION AWSBUCKET AWSKEYFILE EC2PUBLIC
 	return 0
 } # build_ec2_ami()