From owner-svn-src-projects@FreeBSD.ORG Wed May 6 16:21:13 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE95B886; Wed, 6 May 2015 16:21:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD8421BED; Wed, 6 May 2015 16:21:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t46GLDpQ089389; Wed, 6 May 2015 16:21:13 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t46GLDnO089388; Wed, 6 May 2015 16:21:13 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505061621.t46GLDnO089388@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 6 May 2015 16:21:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282557 - projects/release-arm-redux/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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 May 2015 16:21:13 -0000 Author: gjb Date: Wed May 6 16:21:12 2015 New Revision: 282557 URL: https://svnweb.freebsd.org/changeset/base/282557 Log: buildenv_setup(), if overridden in the configuration file, only needs to be invoked once. Sponsored by: The FreeBSD Foundation Modified: projects/release-arm-redux/release/release.sh Modified: projects/release-arm-redux/release/release.sh ============================================================================== --- projects/release-arm-redux/release/release.sh Wed May 6 16:04:11 2015 (r282556) +++ projects/release-arm-redux/release/release.sh Wed May 6 16:21:12 2015 (r282557) @@ -278,12 +278,13 @@ extra_chroot_setup() { done fi + buildenv_setup + return 0 } # extra_chroot_setup() # chroot_build_target(): Build the userland and kernel for the build target. chroot_build_target() { - buildenv_setup load_target_env if [ ! -z "${EMBEDDEDBUILD}" ]; then RELEASE_WMAKEFLAGS="${RELEASE_WMAKEFLAGS} \ @@ -301,7 +302,6 @@ chroot_build_target() { # chroot_build_release(): Invoke the 'make release' target. chroot_build_release() { - buildenv_setup load_target_env if [ -z "${EMBEDDEDBUILD}" ]; then