svn commit: r284943 - in stable/10/release: . tools

[Glen Barber]

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"