From owner-svn-src-projects@FreeBSD.ORG  Tue Aug  5 01:49:30 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 CAF454FE
 for <svn-src-projects@freebsd.org>; Tue,  5 Aug 2014 01:49:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A23BA287E
 for <svn-src-projects@freebsd.org>; Tue,  5 Aug 2014 01:49:30 +0000 (UTC)
Received: from gjb (uid 1237) (envelope-from gjb@FreeBSD.org) id 5863
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Tue, 05 Aug 2014 01:49:30 +0000
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 5 Aug 2014 01:49:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r269555 - projects/release-noxdev/release
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e0382a.5863.1a2a2b59@svn.freebsd.org>
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Aug 2014 01:49:30 -0000

Author: gjb
Date: Tue Aug  5 01:49:30 2014
New Revision: 269555
URL: http://svnweb.freebsd.org/changeset/base/269555

Log:
  Simplify where load_chroot_env() and load_target_env() are
  called.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-noxdev/release/release.sh

Modified: projects/release-noxdev/release/release.sh
==============================================================================
--- projects/release-noxdev/release/release.sh	Tue Aug  5 01:47:07 2014	(r269554)
+++ projects/release-noxdev/release/release.sh	Tue Aug  5 01:49:30 2014	(r269555)
@@ -229,13 +229,13 @@ if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CO
 	cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF}
 fi
 
-load_target_env
 # Embedded builds do not use the 'make release' target.
 if [ -n "${EMBEDDEDBUILD}" ]; then
 	# If a crochet configuration file exists in *this* checkout of
 	# release/, copy it to the /tmp/external directory within the chroot.
 	# This allows building embedded releases without relying on updated
 	# scripts and/or configurations to exist in the branch being built.
+	load_target_env
 	if [ -e ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf ] && \
 		[ -e ${RELENGDIR}/${XDEV}/release.sh ]; then
 			mkdir -p ${CHROOTDIR}/tmp/external/${XDEV}/
@@ -254,7 +254,6 @@ else
 fi
 
 if [ -d ${CHROOTDIR}/usr/ports ]; then
-	load_chroot_env
 	# Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints
 	# is created.  This is needed by ports-mgmt/pkg.
 	chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart
@@ -267,9 +266,9 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then
 		chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
 			${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
 	fi
-	load_target_env
 fi
 
+load_target_env
 eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld
 eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel
 eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \