Author: gjb
Date: Wed Aug 10 14:00:07 2016
New Revision: 303917
URL: https://svnweb.freebsd.org/changeset/base/303917
Log:
MFC r303782:
Fix GCE image publication. The gcutil utility is deprecated in favor
of gcloud.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/Makefile.gce
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/Makefile.gce
==============================================================================
--- stable/10/release/Makefile.gce Wed Aug 10 13:50:21 2016
(r303916)
+++ stable/10/release/Makefile.gce Wed Aug 10 14:00:07 2016
(r303917)
@@ -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}
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
