diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-02-20 18:51:52 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-02-20 18:51:52 +0000 |
| commit | 1db297199a2c723cc6496160d15fb00da6c1267a (patch) | |
| tree | 72962eeac79eac3979ae6bcf6b6bca12ee05ed75 /release | |
| parent | a79d18b7d5774fdcd1926c3aad6b79b49d3f6f15 (diff) | |
| download | src-1db297199a2c723cc6496160d15fb00da6c1267a.tar.gz src-1db297199a2c723cc6496160d15fb00da6c1267a.zip | |
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
Notes
Notes:
svn path=/head/; revision=279074
Diffstat (limited to 'release')
| -rw-r--r-- | release/release.conf.sample | 3 | ||||
| -rwxr-xr-x | release/release.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/release/release.conf.sample b/release/release.conf.sample index f6cfadc6c85c..aecfc34a91c9 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -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= diff --git a/release/release.sh b/release/release.sh index 01a172771c88..6511ec18285c 100755 --- a/release/release.sh +++ b/release/release.sh @@ -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} ${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} \ - WITH_CLOUDWARE=${WITH_CLOUDWARE}" + WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}" # Force src checkout if configured FORCE_SRC_KEY= |