From owner-svn-src-projects@FreeBSD.ORG Tue Aug 5 02:06:22 2014 Return-Path: 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 91FB9B02 for ; Tue, 5 Aug 2014 02:06:22 +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 71D102A43 for ; Tue, 5 Aug 2014 02:06:22 +0000 (UTC) Received: from gjb (uid 1237) (envelope-from gjb@FreeBSD.org) id 5f64 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Tue, 05 Aug 2014 02:06:21 +0000 From: Glen Barber Date: Tue, 5 Aug 2014 02:06:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269560 - projects/release-noxdev/release/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e03c1e.5f64.39aa1840@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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Aug 2014 02:06:22 -0000 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"