From owner-svn-src-projects@FreeBSD.ORG Tue Aug 5 01:47:08 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE8953E0 for ; Tue, 5 Aug 2014 01:47:08 +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 9C77B2867 for ; Tue, 5 Aug 2014 01:47:08 +0000 (UTC) Received: from gjb (uid 1237) (envelope-from gjb@FreeBSD.org) id 584b by svn.freebsd.org (DragonFly Mail Agent v0.9+); Tue, 05 Aug 2014 01:47:07 +0000 From: Glen Barber Date: Tue, 5 Aug 2014 01:47:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269554 - 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: <53e0379b.584b.505a106@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 01:47:08 -0000 Author: gjb Date: Tue Aug 5 01:47:07 2014 New Revision: 269554 URL: http://svnweb.freebsd.org/changeset/base/269554 Log: Redefine load_chroot_env() and load_target_env() in the arm/*.conf files, and reindent. 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 01:44:21 2014 (r269553) +++ projects/release-noxdev/release/arm/BEAGLEBONE.conf Tue Aug 5 01:47:07 2014 (r269554) @@ -4,28 +4,31 @@ # # Build chroot configuration -TARGET="amd64" -TARGET_ARCH="amd64" -SVNROOT="svn://svn.FreeBSD.org/" -SRCBRANCH="base/head@rHEAD" -DOCBRANCH="doc/head@rHEAD" -PORTBRANCH="ports/head@rHEAD" -NODOC=yes +load_chroot_env() { + TARGET="amd64" + TARGET_ARCH="amd64" + SVNROOT="svn://svn.FreeBSD.org/" + SRCBRANCH="base/head@rHEAD" + DOCBRANCH="doc/head@rHEAD" + PORTBRANCH="ports/head@rHEAD" + NODOC=yes +} # Build target configuration -# Since this file is sourced by a script that runs another -# script, these must be exported. -set -a -WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" -KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" -CHROOTDIR="/scratch" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="lang/python textproc/gsed" -XDEV="arm" -XDEV_ARCH="armv6" -XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" -KERNEL="BEAGLEBONE" -CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" -set +a - +load_target_env() { + # Since this file is sourced by a script that runs another + # script, these must be exported. + set -a + WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" + KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" + CHROOTDIR="/scratch" + EMBEDDEDBUILD=1 + EMBEDDEDPORTS="lang/python textproc/gsed" + XDEV="arm" + XDEV_ARCH="armv6" + XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" + KERNEL="BEAGLEBONE" + CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + CROCHETBRANCH="trunk" + set +a +} Modified: projects/release-noxdev/release/arm/PANDABOARD.conf ============================================================================== --- projects/release-noxdev/release/arm/PANDABOARD.conf Tue Aug 5 01:44:21 2014 (r269553) +++ projects/release-noxdev/release/arm/PANDABOARD.conf Tue Aug 5 01:47:07 2014 (r269554) @@ -4,28 +4,31 @@ # # Build chroot configuration -TARGET="amd64" -TARGET_ARCH="amd64" -SVNROOT="svn://svn.FreeBSD.org/" -SRCBRANCH="base/head@rHEAD" -DOCBRANCH="doc/head@rHEAD" -PORTBRANCH="ports/head@rHEAD" -NODOC=yes +load_chroot_env() { + TARGET="amd64" + TARGET_ARCH="amd64" + SVNROOT="svn://svn.FreeBSD.org/" + SRCBRANCH="base/head@rHEAD" + DOCBRANCH="doc/head@rHEAD" + PORTBRANCH="ports/head@rHEAD" + NODOC=yes +} # Build target configuration -# Since this file is sourced by a script that runs another -# script, these must be exported. -set -a -WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" -KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" -CHROOTDIR="/scratch" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="lang/python textproc/gsed" -XDEV="arm" -XDEV_ARCH="armv6" -XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" -KERNEL="PANDABOARD" -CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" -set +a - +load_target_env() { + # Since this file is sourced by a script that runs another + # script, these must be exported. + set -a + WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" + KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" + CHROOTDIR="/scratch" + EMBEDDEDBUILD=1 + EMBEDDEDPORTS="lang/python textproc/gsed" + XDEV="arm" + XDEV_ARCH="armv6" + XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" + KERNEL="PANDABOARD" + CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + CROCHETBRANCH="trunk" + set +a +} Modified: projects/release-noxdev/release/arm/RPI-B.conf ============================================================================== --- projects/release-noxdev/release/arm/RPI-B.conf Tue Aug 5 01:44:21 2014 (r269553) +++ projects/release-noxdev/release/arm/RPI-B.conf Tue Aug 5 01:47:07 2014 (r269554) @@ -4,30 +4,34 @@ # # Build chroot configuration -TARGET="amd64" -TARGET_ARCH="amd64" -SVNROOT="svn://svn.FreeBSD.org/" -SRCBRANCH="base/head@rHEAD" -DOCBRANCH="doc/head@rHEAD" -PORTBRANCH="ports/head@rHEAD" -NODOC=yes +load_chroot_env() { + TARGET="amd64" + TARGET_ARCH="amd64" + SVNROOT="svn://svn.FreeBSD.org/" + SRCBRANCH="base/head@rHEAD" + DOCBRANCH="doc/head@rHEAD" + PORTBRANCH="ports/head@rHEAD" + NODOC=yes +} # Build target configuration -# Since this file is sourced by a script that runs another -# script, these must be exported. -set -a -WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" -KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" -CHROOTDIR="/scratch" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="lang/python textproc/gsed" -XDEV="arm" -XDEV_ARCH="armv6" -XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" -KERNEL="RPI-B" -CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" -UBOOTSRC="https://github.com/gonzoua/u-boot-pi" -UBOOTBRANCH="trunk" -UBOOTDIR="/tmp/crochet/u-boot-rpi" -set +a +load_target_env() { + # Since this file is sourced by a script that runs another + # script, these must be exported. + set -a + WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" + KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" + CHROOTDIR="/scratch" + EMBEDDEDBUILD=1 + EMBEDDEDPORTS="lang/python textproc/gsed" + XDEV="arm" + XDEV_ARCH="armv6" + XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" + KERNEL="RPI-B" + CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + CROCHETBRANCH="trunk" + UBOOTSRC="https://github.com/gonzoua/u-boot-pi" + UBOOTBRANCH="trunk" + UBOOTDIR="/tmp/crochet/u-boot-rpi" + set +a +} Modified: projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf ============================================================================== --- projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf Tue Aug 5 01:44:21 2014 (r269553) +++ projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf Tue Aug 5 01:47:07 2014 (r269554) @@ -4,28 +4,31 @@ # # Build chroot configuration -TARGET="amd64" -TARGET_ARCH="amd64" -SVNROOT="svn://svn.FreeBSD.org/" -SRCBRANCH="base/head@rHEAD" -DOCBRANCH="doc/head@rHEAD" -PORTBRANCH="ports/head@rHEAD" -NODOC=yes +load_chroot_env() { + TARGET="amd64" + TARGET_ARCH="amd64" + SVNROOT="svn://svn.FreeBSD.org/" + SRCBRANCH="base/head@rHEAD" + DOCBRANCH="doc/head@rHEAD" + PORTBRANCH="ports/head@rHEAD" + NODOC=yes +} # Build target configuration -# Since this file is sourced by a script that runs another -# script, these must be exported. -set -a -WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" -KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" -CHROOTDIR="/scratch" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="lang/python textproc/gsed" -XDEV="arm" -XDEV_ARCH="armv6" -XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" -KERNEL="WANDBOARD-QUAD" -CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" -set +a - +load_target_env() { + # Since this file is sourced by a script that runs another + # script, these must be exported. + set -a + WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" + KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" + CHROOTDIR="/scratch" + EMBEDDEDBUILD=1 + EMBEDDEDPORTS="lang/python textproc/gsed" + XDEV="arm" + XDEV_ARCH="armv6" + XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" + KERNEL="WANDBOARD-QUAD" + CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + CROCHETBRANCH="trunk" + set +a +} Modified: projects/release-noxdev/release/arm/ZEDBOARD.conf ============================================================================== --- projects/release-noxdev/release/arm/ZEDBOARD.conf Tue Aug 5 01:44:21 2014 (r269553) +++ projects/release-noxdev/release/arm/ZEDBOARD.conf Tue Aug 5 01:47:07 2014 (r269554) @@ -4,27 +4,30 @@ # # Build chroot configuration -TARGET="amd64" -TARGET_ARCH="amd64" -SVNROOT="svn://svn.FreeBSD.org/" -SRCBRANCH="base/head@rHEAD" -DOCBRANCH="doc/head@rHEAD" -PORTBRANCH="ports/head@rHEAD" -NODOC=yes +load_chroot_env() { + TARGET="amd64" + TARGET_ARCH="amd64" + SVNROOT="svn://svn.FreeBSD.org/" + SRCBRANCH="base/head@rHEAD" + DOCBRANCH="doc/head@rHEAD" + PORTBRANCH="ports/head@rHEAD" + NODOC=yes +} # Build target configuration -# Since this file is sourced by a script that runs another -# script, these must be exported. -set -a -WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" -KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" -CHROOTDIR="/scratch" -EMBEDDEDBUILD=1 -XDEV="arm" -XDEV_ARCH="armv6" -XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" -KERNEL="ZEDBOARD" -CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" -set +a - +load_target_env() { + # Since this file is sourced by a script that runs another + # script, these must be exported. + set -a + WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" + KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" + CHROOTDIR="/scratch" + EMBEDDEDBUILD=1 + XDEV="arm" + XDEV_ARCH="armv6" + XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" + KERNEL="ZEDBOARD" + CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + CROCHETBRANCH="trunk" + set +a +}