svn commit: r269560 - projects/release-noxdev/release/arm

[Glen Barber]

Author: gjb
Date: Tue Aug  5 02:06:21 2014
New Revision: 269560
URL: http://svnweb.freebsd.org/changeset/base/269560

Log:
  Unset potentially conflicting variables in load_chroot_env()
  and load_target_env().
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-noxdev/release/arm/BEAGLEBONE.conf
  projects/release-noxdev/release/arm/PANDABOARD.conf
  projects/release-noxdev/release/arm/RPI-B.conf
  projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf
  projects/release-noxdev/release/arm/ZEDBOARD.conf

Modified: projects/release-noxdev/release/arm/BEAGLEBONE.conf
==============================================================================
--- projects/release-noxdev/release/arm/BEAGLEBONE.conf	Tue Aug  5 02:02:36 2014	(r269559)
+++ projects/release-noxdev/release/arm/BEAGLEBONE.conf	Tue Aug  5 02:06:21 2014	(r269560)
@@ -5,6 +5,7 @@
 
 # Build chroot configuration
 load_chroot_env() {
+	unset XDEV XDEV_ARCH KERNEL
 	TARGET="amd64"
 	TARGET_ARCH="amd64"
 	SVNROOT="svn://svn.FreeBSD.org/"
@@ -19,6 +20,7 @@ load_target_env() {
 	# Since this file is sourced by a script that runs another
 	# script, these must be exported.
 	set -a
+	unset TARGET TARGET_ARCH
 	WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
 	KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
 	CHROOTDIR="/scratch"

Modified: projects/release-noxdev/release/arm/PANDABOARD.conf
==============================================================================
--- projects/release-noxdev/release/arm/PANDABOARD.conf	Tue Aug  5 02:02:36 2014	(r269559)
+++ projects/release-noxdev/release/arm/PANDABOARD.conf	Tue Aug  5 02:06:21 2014	(r269560)
@@ -5,6 +5,7 @@
 
 # Build chroot configuration
 load_chroot_env() {
+	unset XDEV XDEV_ARCH KERNEL
 	TARGET="amd64"
 	TARGET_ARCH="amd64"
 	SVNROOT="svn://svn.FreeBSD.org/"
@@ -19,6 +20,7 @@ load_target_env() {
 	# Since this file is sourced by a script that runs another
 	# script, these must be exported.
 	set -a
+	unset TARGET TARGET_ARCH
 	WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
 	KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
 	CHROOTDIR="/scratch"

Modified: projects/release-noxdev/release/arm/RPI-B.conf
==============================================================================
--- projects/release-noxdev/release/arm/RPI-B.conf	Tue Aug  5 02:02:36 2014	(r269559)
+++ projects/release-noxdev/release/arm/RPI-B.conf	Tue Aug  5 02:06:21 2014	(r269560)
@@ -5,6 +5,7 @@
 
 # Build chroot configuration
 load_chroot_env() {
+	unset XDEV XDEV_ARCH KERNEL
 	TARGET="amd64"
 	TARGET_ARCH="amd64"
 	SVNROOT="svn://svn.FreeBSD.org/"
@@ -19,6 +20,7 @@ load_target_env() {
 	# Since this file is sourced by a script that runs another
 	# script, these must be exported.
 	set -a
+	unset TARGET TARGET_ARCH
 	WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
 	KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
 	CHROOTDIR="/scratch"

Modified: projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf
==============================================================================
--- projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf	Tue Aug  5 02:02:36 2014	(r269559)
+++ projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf	Tue Aug  5 02:06:21 2014	(r269560)
@@ -5,6 +5,7 @@
 
 # Build chroot configuration
 load_chroot_env() {
+	unset XDEV XDEV_ARCH KERNEL
 	TARGET="amd64"
 	TARGET_ARCH="amd64"
 	SVNROOT="svn://svn.FreeBSD.org/"
@@ -19,6 +20,7 @@ load_target_env() {
 	# Since this file is sourced by a script that runs another
 	# script, these must be exported.
 	set -a
+	unset TARGET TARGET_ARCH
 	WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
 	KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
 	CHROOTDIR="/scratch"

Modified: projects/release-noxdev/release/arm/ZEDBOARD.conf
==============================================================================
--- projects/release-noxdev/release/arm/ZEDBOARD.conf	Tue Aug  5 02:02:36 2014	(r269559)
+++ projects/release-noxdev/release/arm/ZEDBOARD.conf	Tue Aug  5 02:06:21 2014	(r269560)
@@ -5,6 +5,7 @@
 
 # Build chroot configuration
 load_chroot_env() {
+	unset XDEV XDEV_ARCH KERNEL
 	TARGET="amd64"
 	TARGET_ARCH="amd64"
 	SVNROOT="svn://svn.FreeBSD.org/"
@@ -19,6 +20,7 @@ load_target_env() {
 	# Since this file is sourced by a script that runs another
 	# script, these must be exported.
 	set -a
+	unset TARGET TARGET_ARCH
 	WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
 	KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
 	CHROOTDIR="/scratch"