Author: gjb
Date: Fri Feb 20 18:51:52 2015
New Revision: 279074
URL: https://svnweb.freebsd.org/changeset/base/279074
Log:
Default XZ_THREADS=0, and add to RELEASE_RMAKEFLAGS
so it is passed to the 'release' make(1) target if
it needs to be adjusted to a non-zero integer.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/release.conf.sample
head/release/release.sh
Modified: head/release/release.conf.sample
==============================================================================
--- head/release/release.conf.sample Fri Feb 20 18:49:49 2015
(r279073)
+++ head/release/release.conf.sample Fri Feb 20 18:51:52 2015
(r279074)
@@ -53,6 +53,9 @@ PORTBRANCH="ports/head@rHEAD"
#WITH_DVD=
#WITH_COMPRESSED_IMAGES=
+## Set to '1' to disable multi-threaded xz(1) compression.
+#XZ_THREADS=0
+
## Set when building embedded images.
#EMBEDDEDBUILD=
Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh Fri Feb 20 18:49:49 2015 (r279073)
+++ head/release/release.sh Fri Feb 20 18:51:52 2015 (r279074)
@@ -93,6 +93,7 @@ WITH_COMPRESSED_IMAGES=
# the release.
WITH_VMIMAGES=
WITH_COMPRESSED_VMIMAGES=
+XZ_THREADS=0
# Set to non-empty value to build virtual machine images for various
# cloud providers as part of the release.
@@ -179,7 +180,7 @@ RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORL
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} \
- WITH_CLOUDWARE=${WITH_CLOUDWARE}"
+ WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}"
# Force src checkout if configured
FORCE_SRC_KEY=
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
