svn commit: r272392 - projects/release-vmimage/release
Glen Barber
gjb at FreeBSD.org
Thu Oct 2 00:34:04 UTC 2014
Author: gjb
Date: Thu Oct 2 00:34:03 2014
New Revision: 272392
URL: https://svnweb.freebsd.org/changeset/base/272392
Log:
Add WITH_COMPRESSED_VMIMAGES variable, which when set enables
xz(1) compression of the virtual machine images.
This is intentionally separate to allow more fine-grained
tuning over which images are compressed, especially in cases
where compressing 20GB sparse images can take hours.
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 Thu Oct 2 00:25:57 2014 (r272391)
+++ projects/release-vmimage/release/Makefile Thu Oct 2 00:34:03 2014 (r272392)
@@ -24,6 +24,8 @@
# 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
#
@@ -301,7 +303,7 @@ install:
cp -p ${VMBASE}.${FORMAT} \
${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
. endfor
-. if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
+. 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}
Modified: projects/release-vmimage/release/release.conf.sample
==============================================================================
--- projects/release-vmimage/release/release.conf.sample Thu Oct 2 00:25:57 2014 (r272391)
+++ projects/release-vmimage/release/release.conf.sample Thu Oct 2 00:34:03 2014 (r272392)
@@ -81,6 +81,10 @@ PORTBRANCH="ports/head at rHEAD"
## 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"
Modified: projects/release-vmimage/release/release.sh
==============================================================================
--- projects/release-vmimage/release/release.sh Thu Oct 2 00:25:57 2014 (r272391)
+++ projects/release-vmimage/release/release.sh Thu Oct 2 00:34:03 2014 (r272392)
@@ -89,6 +89,11 @@ 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
@@ -274,4 +279,5 @@ 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}
+ install DESTDIR=/R WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES} \
+ WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES}
More information about the svn-src-projects
mailing list