From owner-svn-src-user@FreeBSD.ORG  Thu Sep 18 15:26:13 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4DA0210A;
 Thu, 18 Sep 2014 15:26:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 399057C8;
 Thu, 18 Sep 2014 15:26:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8IFQDM2098281;
 Thu, 18 Sep 2014 15:26:13 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8IFQDxF098280;
 Thu, 18 Sep 2014 15:26:13 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201409181526.s8IFQDxF098280@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 18 Sep 2014 15:26:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r271780 - user/gjb/thermite
X-SVN-Group: user
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.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Sep 2014 15:26:13 -0000

Author: gjb
Date: Thu Sep 18 15:26:12 2014
New Revision: 271780
URL: http://svnweb.freebsd.org/changeset/base/271780

Log:
  Defer running mk-vmimage.sh until after all normal
  (i.e., ISOs) bits are built.
  
  This eliminates a significant delay between the completion
  of the amd64 ISO creation and the start of the i386
  build (more than one hour).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Thu Sep 18 15:10:22 2014	(r271779)
+++ user/gjb/thermite/thermite.sh	Thu Sep 18 15:26:12 2014	(r271780)
@@ -250,11 +250,8 @@ build_release() {
 
 	send_logmail ${logdir}/${_build}.log ${_build}
 
-	# Short circuit to skip vm image creation for non-x86 architectures.
-	# Also recreate the memstick.img for i386 while here.
+	# Recreate the memstick.img for i386 while here.
 	case ${arch} in
-		amd64)
-			;;
 		i386)
 			/bin/sh ${scriptdir}/remake-memstick.sh \
 				-c ${_conf} >> ${logdir}/${_build}.log
@@ -263,6 +260,23 @@ build_release() {
 			return 0
 			;;
 	esac
+	send_logmail ${logdir}/${_build}.log ${_build}
+	unset _build _conf
+}
+
+build_vmimage() {
+	_build="${rev}-${arch}-${kernel}-${type}"
+	_conf="${scriptdir}/${_build}.conf"
+	source_config || return 0
+
+	case ${arch} in
+		amd64|i386)
+			# continue
+			;;
+		*)
+			return 0
+			;;
+	esac
 	case ${kernel} in
 		GENERIC)
 			info "Building vm image: ${_build}"
@@ -386,6 +400,7 @@ main() {
 	runall build_chroots
 	runall install_chroots
 	runall build_release
+	runall build_vmimage
 }
 
 main "$@"