Revert r272724:

  Features not yet available in stable/10 are needed in
  mkimg(1), and it is more dangerous to tweak these changes
  in stable/10 directly without explicitly testing certain
  failure cases.

  Re-addition of this change is imminent.

Sponsored by:	The FreeBSD Foundation

1 files changed, 2 insertions, 8 deletions

diff --git a/release/release.sh b/release/release.sh
index 56e9fff..7960ba8 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -85,11 +85,6 @@ NOPORTS=
 WITH_DVD=
 WITH_COMPRESSED_IMAGES=
 
-# Set to non-empty value to build virtual machine images as part of
-# the release.
-WITH_VMIMAGES=
-WITH_COMPRESSED_VMIMAGES=
-
 usage() {
 	echo "Usage: $0 [-c release.conf]"
 	exit 1
@@ -173,7 +168,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} WITH_VMIMAGES=${WITH_VMIMAGES}"
+	${DOCPORTS} WITH_DVD=${WITH_DVD}"
 
 # Force src checkout if configured
 FORCE_SRC_KEY=
@@ -276,5 +271,4 @@ eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel
 eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
 	release
 eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
-	install DESTDIR=/R WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES} \
-	WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES}
+	install DESTDIR=/R WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES}