From owner-svn-src-head@FreeBSD.ORG  Fri Feb 20 18:51:53 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6DA5B445;
 Fri, 20 Feb 2015 18:51:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5970587C;
 Fri, 20 Feb 2015 18:51:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1KIprdc023921;
 Fri, 20 Feb 2015 18:51:53 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1KIpqZY023918;
 Fri, 20 Feb 2015 18:51:52 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502201851.t1KIpqZY023918@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 20 Feb 2015 18:51:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279074 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Feb 2015 18:51:53 -0000

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=