From c63ea09b5c0dd42b4c8a77a5ae495f28916af978 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 5 Aug 2016 19:00:45 +0000
Subject: [PATCH] Fix GCE image publication.  The gcutil utility is deprecated
 in favor of gcloud.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
---
 release/Makefile.gce | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/Makefile.gce b/release/Makefile.gce
index b6b6577cc7bd..5bdfb5d2ce62 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -35,7 +35,7 @@ gce-check-depends:
 	@false
 . endif
 .endfor
-.if !exists(/usr/local/bin/gcutil)
+.if !exists(/usr/local/bin/gcloud)
 . if !exists(${PORTSDIR}/net/google-cloud-sdk/Makefile)
 .  if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
@@ -63,7 +63,7 @@ gce-do-upload:
 	/usr/local/bin/gsutil mb gs://${GCE_BUCKET} || true
 	/usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \
 		gs://${GCE_BUCKET}/
-	/usr/local/bin/gcutil addimage ${GCE_TARGET} \
-		gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz
+	/usr/local/bin/gcloud compute images create ${GCE_TARGET} \
+		--source-uri gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz
 	touch ${.OBJDIR}/${.TARGET}