Index: head/release/arm/BEAGLEBONE.conf
===================================================================
--- head/release/arm/BEAGLEBONE.conf	(revision 269638)
+++ head/release/arm/BEAGLEBONE.conf	(revision 269639)
@@ -1,30 +1,37 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="lang/python textproc/gsed"
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="BEAGLEBONE"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-set +a
-
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export EMBEDDEDPORTS="lang/python textproc/gsed"
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="BEAGLEBONE"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+}
Index: head/release/arm/PANDABOARD.conf
===================================================================
--- head/release/arm/PANDABOARD.conf	(revision 269638)
+++ head/release/arm/PANDABOARD.conf	(revision 269639)
@@ -1,30 +1,37 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="lang/python textproc/gsed"
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="lang/python textproc/gsed"
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="PANDABOARD"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-set +a
-
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="PANDABOARD"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+}
Index: head/release/arm/RPI-B.conf
===================================================================
--- head/release/arm/RPI-B.conf	(revision 269638)
+++ head/release/arm/RPI-B.conf	(revision 269639)
@@ -1,32 +1,40 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="lang/python textproc/gsed"
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="lang/python textproc/gsed"
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="RPI-B"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-UBOOTSRC="https://github.com/gonzoua/u-boot-pi"
-UBOOTBRANCH="trunk"
-UBOOTDIR="/tmp/crochet/u-boot-rpi"
-set +a
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="RPI-B"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+	export UBOOTSRC="https://github.com/gonzoua/u-boot-pi"
+	export UBOOTBRANCH="trunk"
+	export UBOOTDIR="/tmp/crochet/u-boot-rpi"
+}
Index: head/release/arm/WANDBOARD-QUAD.conf
===================================================================
--- head/release/arm/WANDBOARD-QUAD.conf	(revision 269638)
+++ head/release/arm/WANDBOARD-QUAD.conf	(revision 269639)
@@ -1,30 +1,37 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="lang/python textproc/gsed"
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="lang/python textproc/gsed"
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="WANDBOARD-QUAD"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-set +a
-
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="WANDBOARD-QUAD"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+}
Index: head/release/arm/ZEDBOARD.conf
===================================================================
--- head/release/arm/ZEDBOARD.conf	(revision 269638)
+++ head/release/arm/ZEDBOARD.conf	(revision 269639)
@@ -1,29 +1,36 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="ZEDBOARD"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-set +a
-
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="ZEDBOARD"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+}
Index: head/release/arm/release.sh
===================================================================
--- head/release/arm/release.sh	(revision 269638)
+++ head/release/arm/release.sh	(revision 269639)
@@ -1,131 +1,139 @@
 #!/bin/sh
 #-
 # Copyright (c) 2013, 2014 The FreeBSD Foundation
 # All rights reserved.
 #
 # This software was developed by Glen Barber
 # under sponsorship from the FreeBSD Foundation.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 # This script is intended to be called by release/release.sh to build ARM
 # images for release.  It is not intended to be run directly.  This sets up
 # the software needed within a build chroot, then runs crochet to provide
 # downloadable images for embedded devices.
 
 set -e
 
 before_build() {
 	WANT_UBOOT=
 	KNOWNHASH=
 	UBOOT_VERSION=
 	case ${KERNEL} in
 		BEAGLEBONE)
 			WANT_UBOOT=1
 			KNOWNHASH="4150e5a4480707c55a8d5b4570262e43af68d8ed3bdc0a433d8e7df47989a69e"
 			UBOOT_VERSION="u-boot-2013.04"
 			;;
 		PANDABOARD)
 			WANT_UBOOT=1
 			KNOWNHASH="e08e20a6979bfca6eebb9a2b0e42aa4416af3d796332fd63a3470495a089d496"
 			UBOOT_VERSION="u-boot-2012.07"
 			;;
 		WANDBOARD-QUAD)
 			WANT_UBOOT=1
 			KNOWNHASH="0d71e62beb952b41ebafb20a7ee4df2f960db64c31b054721ceb79ff14014c55"
 			UBOOT_VERSION="u-boot-2013.10"
 			;;
 		*)
 			# Fallthrough.
 			;;
 	esac
 	if [ ! -z ${WANT_UBOOT} ]; then
 		chroot ${CHROOTDIR} fetch -o /tmp/crochet/${UBOOT_VERSION}.tar.bz2 \
 			http://people.freebsd.org/~gjb/${UBOOT_VERSION}.tar.bz2
 		UBOOT_HASH="$(sha256 -q ${CHROOTDIR}/tmp/crochet/${UBOOT_VERSION}.tar.bz2)"
 		if [ "${UBOOT_HASH}" != "${KNOWNHASH}" ]; then
 			echo "Checksum mismatch!  Exiting now."
 			exit 1
 		fi
 		chroot ${CHROOTDIR} tar xf /tmp/crochet/${UBOOT_VERSION}.tar.bz2 \
 			-C /tmp/crochet/ 
 	fi
 }
 
 install_crochet() {
 	chroot ${CHROOTDIR} svn co -q ${CROCHETSRC}/${CROCHETBRANCH} \
 		/tmp/crochet
 }
 
 install_uboot() {
 	# Only fetch u-boot sources if UBOOTSRC is set; otherwise it is
 	# not needed.
 	if [ -n "${UBOOTSRC}" ]; then
 		continue
 	else
 		return 0
 	fi
 	chroot ${CHROOTDIR} svn co -q ${UBOOTSRC}/${UBOOTBRANCH} \
 		/${UBOOTDIR}
 }
 
 main() {
 	# Build the 'xdev' target for crochet.
 	eval chroot ${CHROOTDIR} make -C /usr/src \
-		${XDEV_FLAGS} TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
+		${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
+		TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 		${WORLD_FLAGS} xdev
+
+	# Install the cross-build symlinks to /usr/bin to make crochet
+	# happy.
+	eval chroot ${CHROOTDIR} make -C /usr/src \
+		${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
+		TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
+		${WORLD_FLAGS} xdev-links
 
 	# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
 	# is created.
 	eval chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart
 	# Install security/ca_root_nss since we need to check the https
 	# certificate of github.
 	eval chroot ${CHROOTDIR} make -C /usr/ports/security/ca_root_nss \
 		OPTIONS_SET="ETCSYMLINK" BATCH=1 FORCE_PKG_REGISTER=1 \
 		install clean distclean
 	EMBEDDEDPORTS="${EMBEDDEDPORTS} devel/subversion"
 	for _PORT in ${EMBEDDEDPORTS}; do
 		eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
 			BATCH=1 FORCE_PKG_REGISTER=1 install clean distclean
 	done
 
 	eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/cc \
 		WITH_GCC=1 ${WORLD_FLAGS} -j1 obj depend all install
 
 	mkdir -p ${CHROOTDIR}/tmp/crochet/work
 	before_build
 	install_crochet
 	install_uboot
 	eval chroot ${CHROOTDIR} /bin/sh /tmp/crochet/crochet.sh \
 		-c /tmp/external/${XDEV}/crochet-${KERNEL}.conf
 	mkdir -p ${CHROOTDIR}/R/
 	cp -p ${CHROOTDIR}/usr/obj/*.img ${CHROOTDIR}/R/
 	bzip2 ${CHROOTDIR}/R/FreeBSD*.img
 	cd ${CHROOTDIR}/R/ && sha256 FreeBSD*.img.bz2 > CHECKSUM.SHA256
 	cd ${CHROOTDIR}/R/ && md5 FreeBSD*.img.bz2 > CHECKSUM.MD5
 }
 
 main "$@"
 exit 0
Index: head/release/release.conf.sample
===================================================================
--- head/release/release.conf.sample	(revision 269638)
+++ head/release/release.conf.sample	(revision 269639)
@@ -1,74 +1,79 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Redefine environment variables here to override prototypes
+# defined in release.sh.
+load_chroot_env() { }
+load_target_env() { }
+
 ## Set the directory within which the release will be built.
 CHROOTDIR="/scratch"
 
 ## Set the svn host.
 SVNROOT="svn://svn.FreeBSD.org/"
 
 ## Set the src/, ports/, and doc/ branches or tags.
 SRCBRANCH="base/head@rHEAD"
 DOCBRANCH="doc/head@rHEAD"
 PORTBRANCH="ports/head@rHEAD"
 
 ## Run svn co --force for src checkout.
 #SRC_FORCE_CHECKOUT=yes
 
 ## Sample configuration for using git instead of svn.
 #VCSCMD="/usr/local/bin/git clone --branch master"
 #SVNROOT=""
 #SRCBRANCH="https://github.com/freebsd/freebsd"
 #DOCBRANCH="https://github.com/freebsd/freebsd-doc"
 #PORTBRANCH="https://github.com/freebsd/freebsd-ports"
 
 ## Set to override the default target architecture.
 #TARGET="amd64"
 #TARGET_ARCH="amd64"
 #KERNEL="GENERIC"
 ## Multiple kernels may be set.
 #KERNEL="GENERIC XENHVM"
 
 ## Set to specify a custom make.conf and/or src.conf
 #MAKE_CONF="/etc/local/make.conf"
 #SRC_CONF="/etc/local/src.conf"
 
 ## Set to use make(1) flags.
 #MAKE_FLAGS="-s"
 
 ## Set to use world- and kernel-specific make(1) flags.
 #WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
 #KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
 
 ## Set miscellaneous 'make release' settings.
 #NODOC=
 #NOPORTS=
 #WITH_DVD=
 #WITH_COMPRESSED_IMAGES=
 
 ## Set when building embedded images.
 #EMBEDDEDBUILD=
 
 ## Set to skip the chroot environment buildworld/installworld/distribution
 ## step if it is expected the build environment will exist via alternate
 ## means.
 #CHROOTBUILD_SKIP=
 
 ## Set to a non-empty value skip checkout or update of /usr/src in
 ## the chroot.  This is intended for use when /usr/src already exists.
 #SRC_UPDATE_SKIP=
 
 ## Set to a non-empty value skip checkout or update of /usr/doc in
 ## the chroot.  This is intended for use when /usr/doc already exists.
 #DOC_UPDATE_SKIP=
 
 ## Set to a non-empty value skip checkout or update of /usr/ports in
 ## the chroot.  This is intended for use when /usr/ports already exists.
 #PORTS_UPDATE_SKIP=
 
 ## Set to pass additional flags to make(1) for the build chroot setup, such
 ## as TARGET/TARGET_ARCH.
 #CHROOT_MAKEENV=
 
Index: head/release/release.sh
===================================================================
--- head/release/release.sh	(revision 269638)
+++ head/release/release.sh	(revision 269639)
@@ -1,269 +1,272 @@
 #!/bin/sh
 #-
 # Copyright (c) 2013, 2014 The FreeBSD Foundation
 # Copyright (c) 2013 Glen Barber
 # Copyright (c) 2011 Nathan Whitehorn
 # All rights reserved.
 #
 # Portions of this software were developed by Glen Barber
 # under sponsorship from the FreeBSD Foundation.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # release.sh: check out source trees, and build release components with
 #  totally clean, fresh trees.
 # Based on release/generate-release.sh written by Nathan Whitehorn
 #
 # $FreeBSD$
 #
 
 PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
 export PATH
 
+# Prototypes that can be redefined per-chroot or per-target.
+load_chroot_env() { }
+load_target_env() { }
+
 # The directory within which the release will be built.
 CHROOTDIR="/scratch"
 RELENGDIR="$(realpath $(dirname $(basename ${0})))"
 
 # The default version control system command to obtain the sources.
 VCSCMD="svn checkout"
 
 # The default svn checkout server, and svn branches for src/, doc/,
 # and ports/.
 SVNROOT="svn://svn.FreeBSD.org/"
 SRCBRANCH="base/head@rHEAD"
 DOCBRANCH="doc/head@rHEAD"
 PORTBRANCH="ports/head@rHEAD"
 
 # Set for embedded device builds.
 EMBEDDEDBUILD=
 
 # Sometimes one needs to checkout src with --force svn option.
 # If custom kernel configs copied to src tree before checkout, e.g.
 SRC_FORCE_CHECKOUT=
 
 # The default make.conf and src.conf to use.  Set to /dev/null
 # by default to avoid polluting the chroot(8) environment with
 # non-default settings.
 MAKE_CONF="/dev/null"
 SRC_CONF="/dev/null"
 
 # The number of make(1) jobs, defaults to the number of CPUs available for
 # buildworld, and half of number of CPUs available for buildkernel.
 WORLD_FLAGS="-j$(sysctl -n hw.ncpu)"
 KERNEL_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))"
 
 MAKE_FLAGS="-s"
 
 # The name of the kernel to build, defaults to GENERIC.
 KERNEL="GENERIC"
 
 # Set to non-empty value to disable checkout of doc/ and/or ports/.  Disabling
 # ports/ checkout also forces NODOC to be set.
 NODOC=
 NOPORTS=
 
 # Set to non-empty value to build dvd1.iso as part of the release.
 WITH_DVD=
 WITH_COMPRESSED_IMAGES=
 
 usage() {
 	echo "Usage: $0 [-c release.conf]"
 	exit 1
 }
 
 while getopts c: opt; do
 	case ${opt} in
 	c)
 		RELEASECONF="${OPTARG}"
 		if [ ! -e "${RELEASECONF}" ]; then
 			echo "ERROR: Configuration file ${RELEASECONF} does not exist."
 			exit 1
 		fi
 		# Source the specified configuration file for overrides
 		. ${RELEASECONF}
 		;;
 	\?)
 		usage
 		;;
 	esac
 done
 shift $(($OPTIND - 1))
 
 # Fix for backwards-compatibility with release.conf that does not have the
 # trailing '/'.
 case ${SVNROOT} in
 	*svn*)
 		SVNROOT="${SVNROOT}/"
 		;;
 	*)
 		;;
 esac
 
 # Prefix the branches with the SVNROOT for the full checkout URL.
 SRCBRANCH="${SVNROOT}${SRCBRANCH}"
 DOCBRANCH="${SVNROOT}${DOCBRANCH}"
 PORTBRANCH="${SVNROOT}${PORTBRANCH}"
 
 if [ -n "${EMBEDDEDBUILD}" ]; then
-	if [ -z "${XDEV}" ] || [ -z "${XDEV_ARCH}" ]; then
-		echo "ERROR: XDEV and XDEV_ARCH must be set in ${RELEASECONF}."
-		exit 1
-	fi
 	WITH_DVD=
 	WITH_COMPRESSED_IMAGES=
 	NODOC=yes
 fi
 
 # If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree
 # is required to build the documentation set.
 if [ -n "${NOPORTS}" ] && [ -z "${NODOC}" ]; then
 	echo "*** NOTICE: Setting NODOC=1 since ports tree is required"
 	echo "            and NOPORTS is set."
 	NODOC=yes
 fi
 
 # If NOPORTS and/or NODOC are unset, they must not pass to make as variables.
 # The release makefile verifies definedness of NOPORTS/NODOC variables
 # instead of their values.
 DOCPORTS=
 if [ -n "${NOPORTS}" ]; then
 	DOCPORTS="NOPORTS=yes "
 fi
 if [ -n "${NODOC}" ]; then
 	DOCPORTS="${DOCPORTS}NODOC=yes"
 fi
 
 # The aggregated build-time flags based upon variables defined within
 # this file, unless overridden by release.conf.  In most cases, these
 # will not need to be changed.
 CONF_FILES="__MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF}"
 if [ -n "${TARGET}" ] && [ -n "${TARGET_ARCH}" ]; then
 	ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
 else
 	ARCH_FLAGS=
 fi
+load_chroot_env
 CHROOT_MAKEENV="${CHROOT_MAKEENV} MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
 CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
 CHROOT_IMAKEFLAGS="${CONF_FILES}"
 CHROOT_DMAKEFLAGS="${CONF_FILES}"
 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}"
 
 # Force src checkout if configured
 FORCE_SRC_KEY=
 if [ -n "${SRC_FORCE_CHECKOUT}" ]; then
 	FORCE_SRC_KEY="--force"
 fi
 
 if [ -z "${CHROOTDIR}" ]; then
 	echo "Please set CHROOTDIR."
 	exit 1
 fi
 
 if [ $(id -u) -ne 0 ]; then
 	echo "Needs to be run as root."
 	exit 1
 fi
 
 set -e # Everything must succeed
 
 mkdir -p ${CHROOTDIR}/usr
 
 if [ -z "${SRC_UPDATE_SKIP}" ]; then
 	${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src
 fi
 if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
 	${VCSCMD} ${DOCBRANCH} ${CHROOTDIR}/usr/doc
 fi
 if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
 	${VCSCMD} ${PORTBRANCH} ${CHROOTDIR}/usr/ports
 fi
 
 if [ -z "${CHROOTBUILD_SKIP}" ]; then
 	cd ${CHROOTDIR}/usr/src
 	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}
 fi
 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
 
 # If MAKE_CONF and/or SRC_CONF are set and not character devices (/dev/null),
 # copy them to the chroot.
 if [ -e ${MAKE_CONF} ] && [ ! -c ${MAKE_CONF} ]; then
 	mkdir -p ${CHROOTDIR}/$(dirname ${MAKE_CONF})
 	cp ${MAKE_CONF} ${CHROOTDIR}/${MAKE_CONF}
 fi
 if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CONF} ]; then
 	mkdir -p ${CHROOTDIR}/$(dirname ${SRC_CONF})
 	cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF}
 fi
 
 # 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}/
 			cp ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf \
 				${CHROOTDIR}/tmp/external/${XDEV}/crochet-${KERNEL}.conf
 			/bin/sh ${RELENGDIR}/${XDEV}/release.sh
 	fi
 	# If the script does not exist for this architecture, exit.
 	# This probably should be checked earlier, but allowing the rest
 	# of the build process to get this far will at least set up the
 	# chroot environment for testing.
 	exit 0
 else
 	# Not embedded.
 	continue
 fi
 
 if [ -d ${CHROOTDIR}/usr/ports ]; then
 	# 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
 
 	## Trick the ports 'run-autotools-fixup' target to do the right thing.
 	_OSVERSION=$(sysctl -n kern.osreldate)
 	if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
 		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
 		PBUILD_FLAGS="${PBUILD_FLAGS}"
 		chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
 			${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
 	fi
 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} \
 	release
 eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
 	install DESTDIR=/R WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES}