From owner-svn-src-user@freebsd.org Thu May 26 18:37:53 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 1899BB4BE89
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 26 May 2016 18:37:53 +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 DA74617E1;
Thu, 26 May 2016 18:37:52 +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 u4QIbqZ1066822;
Thu, 26 May 2016 18:37:52 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4QIbqxQ066821;
Thu, 26 May 2016 18:37:52 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201605261837.u4QIbqxQ066821@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: Thu, 26 May 2016 18:37:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r300765 - 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.22
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
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: Thu, 26 May 2016 18:37:53 -0000
Author: gjb
Date: Thu May 26 18:37:51 2016
New Revision: 300765
URL: https://svnweb.freebsd.org/changeset/base/300765
Log:
Resync from upstream:
- Remove the pkgbase bits.
- Disconnect upload_azure_image(), as FreeBSD on Azure has
been taken over by Microsoft.
Sponsored by: The FreeBSD Foundation
Modified:
user/gjb/thermite/thermite.sh
Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh Thu May 26 18:35:37 2016 (r300764)
+++ user/gjb/thermite/thermite.sh Thu May 26 18:37:51 2016 (r300765)
@@ -282,12 +282,6 @@ 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}/* \
@@ -550,12 +544,10 @@ main() {
runall build_chroots
runall install_chroots
runall build_release
- if [ -z "${TURNITUPTOELEVEN}" ]; then
- runall upload_ec2_ami
- runall upload_azure_image
- runall upload_gce_image
- runall upload_vagrant_image
- fi
+ runall upload_ec2_ami
+ #runall upload_azure_image
+ runall upload_gce_image
+ runall upload_vagrant_image
}
main "$@"