From c3955757a946b1ba02b1e0c1580c565e431bd5a0 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Thu, 10 May 2018 21:46:58 +0000 Subject: [PATCH] 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'. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- release/Makefile.gce | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index bbdc4981a613..e466f9a323bd 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -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,.,-,} @@ -70,7 +71,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}