From owner-svn-src-all@FreeBSD.ORG Tue May 5 16:38:00 2015 Return-Path: Delivered-To: svn-src-all@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 C23C8E16; Tue, 5 May 2015 16:38:00 +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 B15E51A79; Tue, 5 May 2015 16:38:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t45Gc00Z077948; Tue, 5 May 2015 16:38:00 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t45Gc0da077947; Tue, 5 May 2015 16:38:00 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505051638.t45Gc0da077947@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 5 May 2015 16:38:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282501 - head/release/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2015 16:38:00 -0000 Author: gjb Date: Tue May 5 16:37:59 2015 New Revision: 282501 URL: https://svnweb.freebsd.org/changeset/base/282501 Log: Remove buildenv_setup(), and set EMBEDDEDPORTS to the sysutils/u-boot-rpi2 port, since these cases are already handled by arm/release.sh. Sponsored by: The FreeBSD Foundation Modified: head/release/arm/RPI2.conf Modified: head/release/arm/RPI2.conf ============================================================================== --- head/release/arm/RPI2.conf Tue May 5 16:28:04 2015 (r282500) +++ head/release/arm/RPI2.conf Tue May 5 16:37:59 2015 (r282501) @@ -13,7 +13,7 @@ export WORLD_FLAGS="-j $(sysctl -n hw.nc export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" export CHROOTDIR="/scratch" export EMBEDDEDBUILD=1 -export UBOOT_PORT="sysutils/u-boot-rpi2" +export EMBEDDEDPORTS="sysutils/u-boot-rpi2" # Build chroot configuration load_chroot_env() { @@ -36,18 +36,3 @@ load_target_env() { export CROCHETBRANCH="trunk@rHEAD" } -# Build environment setup -buildenv_setup() { - if [ ! -d ${CHROOTDIR}/usr/ports/${UBOOT_PORT} ]; then - chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \ - /usr/sbin/pkg bootstrap -y - chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \ - /usr/sbin/pkg install -y ${UBOOT_PORT} - else - chroot ${CHROOTDIR} env BATCH=1 \ - make -C /usr/ports/${UBOOT_PORT} \ - all install clean - fi - return 0 -} -