From owner-svn-src-user@freebsd.org  Wed Feb 17 07:47:21 2016
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25EA9AA9BEB
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Wed, 17 Feb 2016 07:47:21 +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 mx1.freebsd.org (Postfix) with ESMTPS id EB9001FFC;
 Wed, 17 Feb 2016 07:47:20 +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 u1H7lK1B030974;
 Wed, 17 Feb 2016 07:47:20 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1H7lJ5E030973;
 Wed, 17 Feb 2016 07:47:19 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602170747.u1H7lJ5E030973@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: Wed, 17 Feb 2016 07:47:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295687 - 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.20
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: Wed, 17 Feb 2016 07:47:21 -0000

Author: gjb
Date: Wed Feb 17 07:47:19 2016
New Revision: 295687
URL: https://svnweb.freebsd.org/changeset/base/295687

Log:
  Initial support for packaging base when TURNITUPTOELEVEN is non-empty.
  Skip cloudware bits when this is the case, for now.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Wed Feb 17 07:42:48 2016	(r295686)
+++ user/gjb/thermite/thermite.sh	Wed Feb 17 07:47:19 2016	(r295687)
@@ -282,6 +282,12 @@ ftp_stage() {
 			_type="snapshots"
 			;;
 	esac
+	if [ ! -z "${TURNITUPTOELEVEN}" ]; then
+		chroot ${CHROOTDIR} make -C /usr/src \
+			TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+			KERNCONF=${KERNEL} \
+			packages >> ${logdir}/${_build}.log 2>&1
+	fi
 
 	mkdir -p "${ftpdir}/${_type}"
 	rsync -avH ${CHROOTDIR}/R/ftp-stage/${_type}/* \
@@ -544,10 +550,12 @@ main() {
 	runall build_chroots
 	runall install_chroots
 	runall build_release
-	runall upload_ec2_ami
-	runall upload_azure_image
-	runall upload_gce_image
-	runall upload_vagrant_image
+	if [ ! -z "${TURNITUPTOELEVEN}" ]; then
+		runall upload_ec2_ami
+		runall upload_azure_image
+		runall upload_gce_image
+		runall upload_vagrant_image
+	fi
 }
 
 main "$@"