Author: gjb
Date: Mon May 14 17:44:02 2018
New Revision: 333608
URL: https://svnweb.freebsd.org/changeset/base/333608
Log:
MFC r333473:
Add a special GCE_LICENSE variable to Makefile.gce, which when set,
will include license metadata in the resultant GCE image.
GCE_LICENSE is unset by default, as it primarily pertains to images
produced by the FreeBSD Project, but for downstream FreeBSD consumers,
it can be set in the make(1) environment in the format of:
--licenses="projects/PROJECT_ID/global/licenses/LICENSE_NAME"
The "license" is not a license, per se, but required metadata that
is required by the GCE marketplace. For the FreeBSD Project, the
license name is simply 'freebsd', with the description of 'FreeBSD'.
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 Mon May 14 17:43:43 2018
(r333607)
+++ stable/10/release/Makefile.gce Mon May 14 17:44:02 2018
(r333608)
@@ -17,6 +17,7 @@ GCE_UPLOAD_TGTS= gce-do-login
CLEANFILES+= ${GCE_UPLOAD_TGTS}
GCE_BUCKET?=
+GCE_LICENSE?=
.if !defined(GCE_FAMILY) || empty(GCE_FAMILY)
GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,}
@@ -69,7 +70,7 @@ gce-do-upload:
/usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \
gs://${GCE_BUCKET}/
/usr/local/bin/gcloud compute images create ${GCE_TARGET} \
- --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} \
+ --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \
--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"
