From owner-svn-src-projects@FreeBSD.ORG Wed Aug 6 16:25:09 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 CBCF5E45 for ; Wed, 6 Aug 2014 16:25:09 +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 A163B23DA for ; Wed, 6 Aug 2014 16:25:09 +0000 (UTC) Received: from gjb (uid 1237) (envelope-from gjb@FreeBSD.org) id 517b by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 16:25:09 +0000 From: Glen Barber Date: Wed, 6 Aug 2014 16:25:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269629 - 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: <53e256e5.517b.4c9f7e40@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: Wed, 06 Aug 2014 16:25:09 -0000 Author: gjb Date: Wed Aug 6 16:25:09 2014 New Revision: 269629 URL: http://svnweb.freebsd.org/changeset/base/269629 Log: In arm/release.sh, switch TARGET/TARGET_ARCH back to the original XDEV/XDEV_ARCH make(1) variables. In theory, this should have been a no-op, but the TARGET and TARGET_ARCH are now unset in load_target_env() to avoid collision with the chroot userland. Sponsored by: The FreeBSD Foundation Modified: projects/release-noxdev/release/arm/release.sh Modified: projects/release-noxdev/release/arm/release.sh ============================================================================== --- projects/release-noxdev/release/arm/release.sh Wed Aug 6 16:21:43 2014 (r269628) +++ projects/release-noxdev/release/arm/release.sh Wed Aug 6 16:25:09 2014 (r269629) @@ -94,7 +94,7 @@ install_uboot() { 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} \ ${WORLD_FLAGS} xdev # Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints