diff options
| author | gjb <gjb@FreeBSD.org> | 2014-09-28 17:53:10 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-09-28 17:53:10 +0000 |
| commit | 2aaf766ec5c79ded695251b24b986ba4e9c41fea (patch) | |
| tree | 03ab8ce873285dbd7ef6b3a79043e33402fa5c61 /release | |
| parent | e0cf997269969478653e2649742f8a3027ff6766 (diff) | |
| download | FreeBSD-src-2aaf766ec5c79ded695251b24b986ba4e9c41fea.zip FreeBSD-src-2aaf766ec5c79ded695251b24b986ba4e9c41fea.tar.gz | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 3 | ||||
| -rw-r--r-- | release/release.conf.sample | 17 | ||||
| -rwxr-xr-x | release/release.sh | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile index 70eb5a2..ade92ff 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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) diff --git a/release/release.conf.sample b/release/release.conf.sample index bdd5a8a..9acc0e2 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -77,3 +77,20 @@ PORTBRANCH="ports/head@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" diff --git a/release/release.sh b/release/release.sh index e99c403..e7f0c39 100755 --- a/release/release.sh +++ b/release/release.sh @@ -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= |
