From owner-svn-src-all@FreeBSD.ORG  Wed Dec 25 18:25:59 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 398F5F1B;
 Wed, 25 Dec 2013 18:25:59 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 267DC18BB;
 Wed, 25 Dec 2013 18:25:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPIPxuP047854;
 Wed, 25 Dec 2013 18:25:59 GMT (envelope-from jmmv@svn.freebsd.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPIPxNo047853;
 Wed, 25 Dec 2013 18:25:59 GMT (envelope-from jmmv@svn.freebsd.org)
Message-Id: <201312251825.rBPIPxNo047853@svn.freebsd.org>
From: Julio Merino <jmmv@FreeBSD.org>
Date: Wed, 25 Dec 2013 18:25:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259881 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Dec 2013 18:25:59 -0000

Author: jmmv
Date: Wed Dec 25 18:25:58 2013
New Revision: 259881
URL: http://svnweb.freebsd.org/changeset/base/259881

Log:
  Put the release objdir inside the chroot.
  
  When building the system from outside the chroot as part of the release
  process, ensure the objdir is within the chroot so that the whole output
  of the release.sh script is self-contained in a single directory.
  
  Use CHROOTDIR/tmp/obj instead of CHROOTDIR/usr/obj to minimize possible
  interferences with the output of the build itself.
  
  Reviewed by:	gjb
  Approved by:	rpaulo (mentor)

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Wed Dec 25 17:28:18 2013	(r259880)
+++ head/release/release.sh	Wed Dec 25 18:25:58 2013	(r259881)
@@ -126,6 +126,7 @@ if [ "x${TARGET}" != "x" ] && [ "x${TARG
 else
 	ARCH_FLAGS=
 fi
+CHROOT_MAKEENV="MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
 CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
 CHROOT_IMAKEFLAGS="${CONF_FILES}"
 CHROOT_DMAKEFLAGS="${CONF_FILES}"
@@ -163,9 +164,11 @@ if [ "x${NOPORTS}" = "x" ]; then
 fi
 
 cd ${CHROOTDIR}/usr/src
-make ${CHROOT_WMAKEFLAGS} buildworld
-make ${CHROOT_IMAKEFLAGS} installworld DESTDIR=${CHROOTDIR}
-make ${CHROOT_DMAKEFLAGS} distribution DESTDIR=${CHROOTDIR}
+env ${CHROOT_MAKEENV} make ${CHROOT_WMAKEFLAGS} buildworld
+env ${CHROOT_MAKEENV} make ${CHROOT_IMAKEFLAGS} installworld \
+	DESTDIR=${CHROOTDIR}
+env ${CHROOT_MAKEENV} make ${CHROOT_DMAKEFLAGS} distribution \
+	DESTDIR=${CHROOTDIR}
 mount -t devfs devfs ${CHROOTDIR}/dev
 cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
 trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit