Date: Thu, 28 May 2015 15:58:42 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r283649 - user/gjb/thermite Message-ID: <201505281558.t4SFwgeW000489@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505281558.t4SFwgeW000489>