Author: gjb
Date: Wed Oct 8 04:42:56 2014
New Revision: 272727
URL: https://svnweb.freebsd.org/changeset/base/272727
Log:
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
Deleted:
stable/10/release/amd64/mk-vmimage.sh
stable/10/release/i386/mk-vmimage.sh
Modified:
stable/10/release/Makefile
stable/10/release/release.conf.sample
stable/10/release/release.sh
stable/10/share/man/man7/release.7
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile Wed Oct 8 04:35:09 2014 (r272726)
+++ stable/10/release/Makefile Wed Oct 8 04:42:56 2014 (r272727)
@@ -23,9 +23,6 @@
# WITH_DVD: if set, generate dvd1.iso
# WITH_COMPRESSED_IMAGES: if set, compress installation images with xz(1)
# (uncompressed images are not removed)
-# WITH_VMIMAGES: if set, build virtual machine images with the release
-# WITH_COMPRESSED_VMIMAGES: if set, compress virtual machine disk images
-# with xz(1) (extremely time consuming)
# TARGET/TARGET_ARCH: architecture of built release
#
@@ -113,11 +110,6 @@ IMAGES+= uefi-dvd1.iso
. endif
.endif
-VMTARGETS= vm-base vm-image
-VMFORMATS?= vhd vmdk qcow2 raw
-VMSIZE?= 20G
-VMBASE?= vm
-
CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES}
.if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
. for I in ${IMAGES}
@@ -127,16 +119,7 @@ CLEANFILES+= ${I}.xz
.if defined(WITH_DVD) && !empty(WITH_DVD)
CLEANFILES+= pkg-stage
.endif
-.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
-CLEANFILES+= ${VMBASE}.img
-. for FORMAT in ${VMFORMATS}
-CLEANFILES+= ${VMBASE}.${FORMAT}
-. endfor
-.endif
CLEANDIRS= dist ftp release bootonly dvd
-.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
-CLEANDIRS+= ${VMTARGETS}
-.endif
beforeclean:
chflags -R noschg .
.include <bsd.obj.mk>
@@ -314,9 +297,6 @@ 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)
@@ -331,44 +311,3 @@ install:
.endfor
cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256
cd ${DESTDIR} && md5 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.MD5
-.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
- mkdir -p ${DESTDIR}/vmimages
-. for FORMAT in ${VMFORMATS}
- cp -p ${VMBASE}.${FORMAT} \
- ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
-. endfor
-. if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES)
-# This is very time consuming, so defer it after the images are moved to
-# the DESTDIR.
-. for FORMAT in ${VMFORMATS}
- # Don't keep the originals. There is a copy in ${.OBJDIR} if needed.
- ${XZCMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
-. endfor
-. endif
- cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \
- ${DESTDIR}/vmimages/CHECKSUM.SHA256
- cd ${DESTDIR}/vmimages && md5 ${OSRELEASE}* > \
- ${DESTDIR}/vmimages/CHECKSUM.MD5
-.endif
-
-vm-base:
-.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
-. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
- env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \
- ${VMBASE}.img ${WORLDDIR} ${.OBJDIR}/${.TARGET} ${VMSIZE}
-. endif
-.endif
- touch ${.TARGET}
-
-vm-image: vm-base
-.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
-. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
-. for FORMAT in ${VMFORMATS}
- env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \
- ${VMBASE}.img ${FORMAT} ${VMBASE}.${FORMAT}
-. endfor
-. endif
-.endif
- touch ${.TARGET}
Modified: stable/10/release/release.conf.sample
==============================================================================
--- stable/10/release/release.conf.sample Wed Oct 8 04:35:09 2014
(r272726)
+++ stable/10/release/release.conf.sample Wed Oct 8 04:42:56 2014
(r272727)
@@ -72,24 +72,3 @@ 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=
-
-## Set to a non-empty value to compress virtual machine images with xz(1)
-## as part of the release build.
-#WITH_COMPRESSED_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: stable/10/release/release.sh
==============================================================================
--- stable/10/release/release.sh Wed Oct 8 04:35:09 2014
(r272726)
+++ stable/10/release/release.sh Wed Oct 8 04:42:56 2014
(r272727)
@@ -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/sr
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}
Modified: stable/10/share/man/man7/release.7
==============================================================================
--- stable/10/share/man/man7/release.7 Wed Oct 8 04:35:09 2014
(r272726)
+++ stable/10/share/man/man7/release.7 Wed Oct 8 04:42:56 2014
(r272727)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 2, 2014
+.Dd April 11, 2014
.Dt RELEASE 7
.Os
.Sh NAME
@@ -351,61 +351,6 @@ Set to the target directory within
to check out
.Va ${UBOOTSRC}/${UBOOTBRANCH} .
.El
-.Sh VIRTUAL MACHINE DISK IMAGES
-The following
-.Fa release.conf
-variables are relevant only to virtual machine disk image builds:
-.Bl -tag -width Ev
-.It Va WITH_VMIMAGES
-Set to a non-null value to build virtual machine disk images as part
-of the release build.
-.Va WITH_VMIMAGES
-may also be specified as an envirionment variable passed to
-.Xr make 1 .
-.Pp
-The option requires
-.Xr mkimg 1
-version 20140927 or later.
-.It Va WITH_COMPRESSED_VMIMAGES
-Set to a non-null value to compress the virtual machine disk images with
-.Xr xz 1
-as part of the
-.Cm install
-.Xr make 1
-target.
-Note that compressing virtual machine disk images may take a very long
-time on some systems.
-.It Va VMBASE
-Set to change the name of the resulting virtual machine disk image file.
-The default value is
-.Va vm .
-.It Va VMSIZE
-Set to change the size of the virtual machine disk capacity.
-The default value is
-.Va 20G .
-See
-.Xr truncate 1
-for valid values.
-.Pp
-Virtual machine disk images are, by default, created as sparse images.
-When
-.Va WITH_COMPRESSED_VMIMAGES
-is used, the resulting files compressed with
-.Xr xz 1
-compress to roughly the same size, regardless of the specified disk image
-size.
-.It Va VMFORMATS
-Set to the target virtual disk image format(s) to create.
-By default, the
-.Va vhdf , Va vmdk , Va qcow2 ,
-and
-.Va raw
-formats are created.
-See
-.Xr mkimg 1
-for valid format values
-.Pq requires version 20140927 or later .
-.El
.Sh MAKEFILE TARGETS
The release makefile
.Pq Pa src/release/Makefile
@@ -462,14 +407,6 @@ Creates a directory named
.Pa ftp
containing the distribution files used in network installations
and suitable for upload to an FTP mirror.
-.It Cm vm-image
-Creates virtual machine disk images in various formats.
-The
-.Cm vm-image
-target requires the
-.Va WITH_VMIMAGES
-.Xr make 1
-envirionment variable to be set to a non-null value.
.El
.Pp
Major subtargets called by targets above:
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
