From owner-svn-src-user@freebsd.org  Mon May 14 17:49:42 2018
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42F21DFD157
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 14 May 2018 17:49:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id EB3787AE5D;
 Mon, 14 May 2018 17:49:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C6C611F654;
 Mon, 14 May 2018 17:49:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EHnfZw059644;
 Mon, 14 May 2018 17:49:41 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EHnfV5059643;
 Mon, 14 May 2018 17:49:41 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201805141749.w4EHnfV5059643@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 14 May 2018 17:49:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r333609 - user/gjb/thermite
X-SVN-Group: user
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: user/gjb/thermite
X-SVN-Commit-Revision: 333609
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 May 2018 17:49:42 -0000

Author: gjb
Date: Mon May 14 17:49:41 2018
New Revision: 333609
URL: https://svnweb.freebsd.org/changeset/base/333609

Log:
  Re-sync with the RE version of thermite, adding GCE_LICENSE support.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Mon May 14 17:44:02 2018	(r333608)
+++ user/gjb/thermite/thermite.sh	Mon May 14 17:49:41 2018	(r333609)
@@ -437,6 +437,7 @@ upload_gce_image() {
 	chroot ${CHROOTDIR} make -C /usr/src/release \
 		GCE_BUCKET=${GCE_BUCKET} \
 		GCE_LOGIN_SKIP=1 \
+		GCE_LICENSE="${GCE_LICENSE}" \
 		gce-upload \
 		>> ${logdir}/${_build}.gce 2>&1
 	unset _build _conf GCE_BUCKET GCE_CONFIG_DIR GCE_CONFIG_PKG