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

[Glen Barber]

Author: gjb
Date: Sun Sep 28 17:53:10 2014
New Revision: 272264
URL: http://svnweb.freebsd.org/changeset/base/272264

Log:
  release/Makefile:
    Connect the virtual machine image build to the release
    target if WITH_VMIMAGES is set to a non-empty value.
  
  release/release.sh:
    Add WITH_VMIMAGES to RELEASE_RMAKEFLAGS.
  
  release/release.conf.sample:
    Add commented entries for tuning the release build if the
    WITH_VMIMAGES make(1) environment variable is set to
    a non-empty value.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/release-vmimage/release/Makefile
==============================================================================
--- projects/release-vmimage/release/Makefile	Sun Sep 28 17:22:45 2014	(r272263)
+++ projects/release-vmimage/release/Makefile	Sun Sep 28 17:53:10 2014	(r272264)
@@ -278,6 +278,9 @@ ftp: packagesystem
 release:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
+.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
+	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS}
+.endif
 
 install:
 .if defined(DESTDIR) && !empty(DESTDIR)

Modified: projects/release-vmimage/release/release.conf.sample
==============================================================================
--- projects/release-vmimage/release/release.conf.sample	Sun Sep 28 17:22:45 2014	(r272263)
+++ projects/release-vmimage/release/release.conf.sample	Sun Sep 28 17:53:10 2014	(r272264)
@@ -77,3 +77,20 @@ PORTBRANCH="ports/head at rHEAD"
 ## as TARGET/TARGET_ARCH.
 #CHROOT_MAKEENV=
 
+## Set to a non-empty value to build virtual machine images as part of the
+## release build.
+#WITH_VMIMAGES=
+
+## If WITH_VMIMAGES is set to a non-empty value, this is the name of the
+## file to use for the installed userland/kernel.
+#VMBASE="vm"
+
+## If WITH_VMIMAGES is set to a non-empty value, this is the size of the
+## virtual machine disk filesystem.  Valid size values are described in
+## the truncate(1) manual page.
+#VMSIZE="20G"
+
+## If WITH_VMIMAGES is set to a non-empty value, this is a list of disk
+## 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"

Modified: projects/release-vmimage/release/release.sh
==============================================================================
--- projects/release-vmimage/release/release.sh	Sun Sep 28 17:22:45 2014	(r272263)
+++ projects/release-vmimage/release/release.sh	Sun Sep 28 17:53:10 2014	(r272264)
@@ -169,7 +169,7 @@ 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}"
+	${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES}"
 
 # Force src checkout if configured
 FORCE_SRC_KEY=