svn commit: r269630 - projects/release-noxdev/release/arm
Glen Barber
gjb at FreeBSD.org
Wed Aug 6 16:44:33 UTC 2014
Author: gjb
Date: Wed Aug 6 16:44:31 2014
New Revision: 269630
URL: http://svnweb.freebsd.org/changeset/base/269630
Log:
Export variables in the arm/*.conf files because they
need to be passed through release.sh to arm/release.sh.
Set MK_TESTS=no for the xdev target, since that blows
up impressively.
This commit gets the arm build back to the state that
it was in before the XDEV/XDEV_ARCH deprecation, in that
the builds still fail, but they fail in the same way they
did before.
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 Wed Aug 6 16:25:09 2014 (r269629)
+++ projects/release-noxdev/release/arm/BEAGLEBONE.conf Wed Aug 6 16:44:31 2014 (r269630)
@@ -3,36 +3,35 @@
# $FreeBSD$
#
-# Global options.
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head at rHEAD"
-DOCBRANCH="doc/head at rHEAD"
-PORTBRANCH="ports/head at rHEAD"
-NODOC=yes
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="lang/python textproc/gsed"
-CHROOTDIR="/scratch"
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head at rHEAD"
+export DOCBRANCH="doc/head at rHEAD"
+export PORTBRANCH="ports/head at rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
# Build chroot configuration
load_chroot_env() {
+ # Avoid collision with TARGET and XDEV.
unset XDEV XDEV_ARCH KERNEL
- TARGET="amd64"
- TARGET_ARCH="amd64"
+ export TARGET="amd64"
+ export TARGET_ARCH="amd64"
}
# Build target configuration
load_target_env() {
- # Since this file is sourced by a script that runs another
- # script, these must be exported.
- set -a
+ # Avoid collision with TARGET and XDEV.
unset TARGET TARGET_ARCH
- 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
+ export EMBEDDEDPORTS="lang/python textproc/gsed"
+ export XDEV="arm"
+ export XDEV_ARCH="armv6"
+ export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+ export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+ export KERNEL="BEAGLEBONE"
+ export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+ export CROCHETBRANCH="trunk"
}
Modified: projects/release-noxdev/release/arm/PANDABOARD.conf
==============================================================================
--- projects/release-noxdev/release/arm/PANDABOARD.conf Wed Aug 6 16:25:09 2014 (r269629)
+++ projects/release-noxdev/release/arm/PANDABOARD.conf Wed Aug 6 16:44:31 2014 (r269630)
@@ -3,36 +3,35 @@
# $FreeBSD$
#
-# Global options.
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head at rHEAD"
-DOCBRANCH="doc/head at rHEAD"
-PORTBRANCH="ports/head at rHEAD"
-NODOC=yes
-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"
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head at rHEAD"
+export DOCBRANCH="doc/head at rHEAD"
+export PORTBRANCH="ports/head at rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="lang/python textproc/gsed"
# Build chroot configuration
load_chroot_env() {
+ # Avoid collision with TARGET and XDEV.
unset XDEV XDEV_ARCH KERNEL
- TARGET="amd64"
- TARGET_ARCH="amd64"
+ export TARGET="amd64"
+ export TARGET_ARCH="amd64"
}
# Build target configuration
load_target_env() {
- # Since this file is sourced by a script that runs another
- # script, these must be exported.
- set -a
+ # Avoid collision with TARGET and XDEV.
unset TARGET TARGET_ARCH
- 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
+ export XDEV="arm"
+ export XDEV_ARCH="armv6"
+ export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+ export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+ export KERNEL="PANDABOARD"
+ export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+ export CROCHETBRANCH="trunk"
}
Modified: projects/release-noxdev/release/arm/RPI-B.conf
==============================================================================
--- projects/release-noxdev/release/arm/RPI-B.conf Wed Aug 6 16:25:09 2014 (r269629)
+++ projects/release-noxdev/release/arm/RPI-B.conf Wed Aug 6 16:44:31 2014 (r269630)
@@ -3,39 +3,38 @@
# $FreeBSD$
#
-# Global options.
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head at rHEAD"
-DOCBRANCH="doc/head at rHEAD"
-PORTBRANCH="ports/head at rHEAD"
-NODOC=yes
-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"
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head at rHEAD"
+export DOCBRANCH="doc/head at rHEAD"
+export PORTBRANCH="ports/head at rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="lang/python textproc/gsed"
# Build chroot configuration
load_chroot_env() {
+ # Avoid collision with TARGET and XDEV.
unset XDEV XDEV_ARCH KERNEL
- TARGET="amd64"
- TARGET_ARCH="amd64"
+ export TARGET="amd64"
+ export TARGET_ARCH="amd64"
}
# Build target configuration
load_target_env() {
- # Since this file is sourced by a script that runs another
- # script, these must be exported.
- set -a
+ # Avoid collision with TARGET and XDEV.
unset TARGET TARGET_ARCH
- 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
+ export XDEV="arm"
+ export XDEV_ARCH="armv6"
+ export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+ export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+ export KERNEL="RPI-B"
+ export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+ export CROCHETBRANCH="trunk"
+ export UBOOTSRC="https://github.com/gonzoua/u-boot-pi"
+ export UBOOTBRANCH="trunk"
+ export UBOOTDIR="/tmp/crochet/u-boot-rpi"
}
Modified: projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf
==============================================================================
--- projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf Wed Aug 6 16:25:09 2014 (r269629)
+++ projects/release-noxdev/release/arm/WANDBOARD-QUAD.conf Wed Aug 6 16:44:31 2014 (r269630)
@@ -3,36 +3,35 @@
# $FreeBSD$
#
-# Global options.
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head at rHEAD"
-DOCBRANCH="doc/head at rHEAD"
-PORTBRANCH="ports/head at rHEAD"
-NODOC=yes
-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"
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head at rHEAD"
+export DOCBRANCH="doc/head at rHEAD"
+export PORTBRANCH="ports/head at rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="lang/python textproc/gsed"
# Build chroot configuration
load_chroot_env() {
+ # Avoid collision with TARGET and XDEV.
unset XDEV XDEV_ARCH KERNEL
- TARGET="amd64"
- TARGET_ARCH="amd64"
+ export TARGET="amd64"
+ export TARGET_ARCH="amd64"
}
# Build target configuration
load_target_env() {
- # Since this file is sourced by a script that runs another
- # script, these must be exported.
- set -a
+ # Avoid collision with TARGET and XDEV.
unset TARGET TARGET_ARCH
- 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
+ export XDEV="arm"
+ export XDEV_ARCH="armv6"
+ export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+ export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+ export KERNEL="WANDBOARD-QUAD"
+ export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+ export CROCHETBRANCH="trunk"
}
Modified: projects/release-noxdev/release/arm/ZEDBOARD.conf
==============================================================================
--- projects/release-noxdev/release/arm/ZEDBOARD.conf Wed Aug 6 16:25:09 2014 (r269629)
+++ projects/release-noxdev/release/arm/ZEDBOARD.conf Wed Aug 6 16:44:31 2014 (r269630)
@@ -3,35 +3,34 @@
# $FreeBSD$
#
-# Global options.
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head at rHEAD"
-DOCBRANCH="doc/head at rHEAD"
-PORTBRANCH="ports/head at rHEAD"
-NODOC=yes
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head at rHEAD"
+export DOCBRANCH="doc/head at rHEAD"
+export PORTBRANCH="ports/head at rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
# Build chroot configuration
load_chroot_env() {
+ # Avoid collision with TARGET and XDEV.
unset XDEV XDEV_ARCH KERNEL
- TARGET="amd64"
- TARGET_ARCH="amd64"
+ export TARGET="amd64"
+ export TARGET_ARCH="amd64"
}
# Build target configuration
load_target_env() {
- # Since this file is sourced by a script that runs another
- # script, these must be exported.
- set -a
+ # Avoid collision with TARGET and XDEV.
unset TARGET TARGET_ARCH
- 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
+ export XDEV="arm"
+ export XDEV_ARCH="armv6"
+ export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+ export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+ export KERNEL="ZEDBOARD"
+ export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+ export CROCHETBRANCH="trunk"
}
More information about the svn-src-projects
mailing list