From owner-svn-src-stable@freebsd.org  Tue Jun 30 00:51:44 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 7D87598FD8A;
 Tue, 30 Jun 2015 00:51:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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 669CB1D62;
 Tue, 30 Jun 2015 00:51:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5U0pipD096636;
 Tue, 30 Jun 2015 00:51:44 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5U0phJE096634;
 Tue, 30 Jun 2015 00:51:43 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201506300051.t5U0phJE096634@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: Tue, 30 Jun 2015 00:51:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r284943 - in stable/10/release: . tools
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jun 2015 00:51:44 -0000

Author: gjb
Date: Tue Jun 30 00:51:43 2015
New Revision: 284943
URL: https://svnweb.freebsd.org/changeset/base/284943

Log:
  MFC r284882, r284884:
  
   r284882:
    Add initial support for automatically uploading GCE virtual
    machine images to the Google Compute Engine platform.
  
    Remove gce-package.sh.
  
   r284884:
    Fix a vi-invoked typo.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  stable/10/release/Makefile.gce
     - copied, changed from r284882, head/release/Makefile.gce
Deleted:
  stable/10/release/tools/gce-package.sh
Modified:
  stable/10/release/Makefile.vm
Directory Properties:
  stable/10/   (props changed)

Copied and modified: stable/10/release/Makefile.gce (from r284882, head/release/Makefile.gce)
==============================================================================
--- head/release/Makefile.gce	Sat Jun 27 01:29:59 2015	(r284882, copy source)
+++ stable/10/release/Makefile.gce	Tue Jun 30 00:51:43 2015	(r284943)
@@ -36,7 +36,7 @@ gce-check-depends:
 . endif
 .endfor
 .if !exists(/usr/local/bin/gcutil)
-. if !execho ists(${PORTSDIR}/net/google-cloud-api/Makefile)
+. if !exists(${PORTSDIR}/net/google-cloud-api/Makefile)
 .  if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
 .  endif

Modified: stable/10/release/Makefile.vm
==============================================================================
--- stable/10/release/Makefile.vm	Mon Jun 29 21:26:41 2015	(r284942)
+++ stable/10/release/Makefile.vm	Tue Jun 30 00:51:43 2015	(r284943)
@@ -155,3 +155,4 @@ cloudware-install:
 
 .include "${.CURDIR}/Makefile.ec2"
 .include "${.CURDIR}/Makefile.azure"
+.include "${.CURDIR}/Makefile.gce"