svn commit: r274071 - projects/release-vmimage/release

[Glen Barber]

Author: gjb
Date: Tue Nov  4 00:02:23 2014
New Revision: 274071
URL: https://svnweb.freebsd.org/changeset/base/274071

Log:
  Add examples for WITH_CLOUDWARE to release.conf.sample.
  Add WITH_CLOUDWARE evaluation to RELEASE_RMAKEFLAGS.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/release.conf.sample
  projects/release-vmimage/release/release.sh

Modified: projects/release-vmimage/release/release.conf.sample
==============================================================================
--- projects/release-vmimage/release/release.conf.sample	Mon Nov  3 23:59:53 2014	(r274070)
+++ projects/release-vmimage/release/release.conf.sample	Tue Nov  4 00:02:23 2014	(r274071)
@@ -98,3 +98,11 @@ PORTBRANCH="ports/head at rHEAD"
 ## image formats to create.  Valid values are listed in the mkimg(1)
 ## manual page, as well as 'mkimg --formats' output.
 #VMFORMATS="vhdf vmdk qcow2 raw"
+
+## Set to a non-empty value to build virtual machine images for various
+## cloud providers as part of the release build.
+#WITH_CLOUDWARE=
+
+## If WITH_CLOUDWARE is set to a non-empty value, this is a list of providers
+## to create disk images.
+#CLOUDWARE="AZURE OPENSTACK"

Modified: projects/release-vmimage/release/release.sh
==============================================================================
--- projects/release-vmimage/release/release.sh	Mon Nov  3 23:59:53 2014	(r274070)
+++ projects/release-vmimage/release/release.sh	Tue Nov  4 00:02:23 2014	(r274071)
@@ -94,6 +94,10 @@ WITH_COMPRESSED_IMAGES=
 WITH_VMIMAGES=
 WITH_COMPRESSED_VMIMAGES=
 
+# Set to non-empty value to build virtual machine images for various
+# cloud providers as part of the release.
+WITH_CLOUDWARE=
+
 usage() {
 	echo "Usage: $0 [-c release.conf]"
 	exit 1
@@ -174,7 +178,8 @@ CHROOT_DMAKEFLAGS="${CONF_FILES}"
 RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}"
 RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
 RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \
-	${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES}"
+	${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \
+	WITH_CLOUDWARE=${WITH_CLOUDWARE}"
 
 # Force src checkout if configured
 FORCE_SRC_KEY=