aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-05-06 15:58:21 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-05-06 15:58:21 +0000
commitcf582ac56f75c9db1242ef354d30202759f7b875 (patch)
tree99b7bcd33082d7a0fb2706244dd8e6b05c9f772c
parenta03128832c6c71a3544f1c5ef0b15a17122c8f51 (diff)
downloadsrc-cf582ac56f75c9db1242ef354d30202759f7b875.tar.gz
src-cf582ac56f75c9db1242ef354d30202759f7b875.zip
Update the arm/*.conf configuration files to only set
EMBEDDEDBUILD, EMBEDDED_TARGET, EMBEDDED_TARGET_ARCH, EMBEDDEDPORTS, and KERNEL. In release.sh, set TARGET and TARGET_ARCH to the EMBEDDED_* variants from the configuration file. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-arm-redux/; revision=282554
-rw-r--r--release/arm/BEAGLEBONE.conf38
-rw-r--r--release/arm/PANDABOARD.conf37
-rw-r--r--release/arm/RPI-B.conf40
-rw-r--r--release/arm/RPI2.conf38
-rw-r--r--release/arm/WANDBOARD-QUAD.conf37
-rw-r--r--release/arm/ZEDBOARD.conf35
-rwxr-xr-xrelease/release.sh8
7 files changed, 37 insertions, 196 deletions
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 72337f831cc3..19b88cb12f59 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -3,36 +3,8 @@
# $FreeBSD$
#
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@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="sysutils/u-boot-beaglebone"
-
-# Build chroot configuration
-load_chroot_env() {
- # Avoid collision with TARGET and XDEV.
- unset XDEV XDEV_ARCH KERNEL
- export TARGET="amd64"
- export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
- # Avoid collision with TARGET and XDEV.
- unset TARGET TARGET_ARCH
- 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/freebsd/crochet"
- export CROCHETBRANCH="trunk@rHEAD"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
+KERNEL="BEAGLEBONE"
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index dc8952d333b4..4cbe7e512b96 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -3,35 +3,8 @@
# $FreeBSD$
#
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@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
- export TARGET="amd64"
- export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
- # Avoid collision with TARGET and XDEV.
- unset TARGET TARGET_ARCH
- 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/freebsd/crochet"
- export CROCHETBRANCH="trunk@rHEAD"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
+KERNEL="PANDABOARD"
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index aae60c9831a9..28562c15a1f5 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -3,38 +3,8 @@
# $FreeBSD$
#
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@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
- export TARGET="amd64"
- export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
- # Avoid collision with TARGET and XDEV.
- unset TARGET TARGET_ARCH
- 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/freebsd/crochet"
- export CROCHETBRANCH="trunk@rHEAD"
- export UBOOTSRC="https://github.com/gonzoua/u-boot-pi"
- export UBOOTBRANCH="trunk"
- export UBOOTDIR="/tmp/crochet/u-boot-rpi"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-rpi"
+KERNEL="RPI-B"
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index bb8ebe998ca9..4f8ea2f6a9e3 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -3,36 +3,8 @@
# $FreeBSD$
#
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@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="sysutils/u-boot-rpi2"
-
-# Build chroot configuration
-load_chroot_env() {
- # Avoid collision with TARGET and XDEV.
- unset XDEV XDEV_ARCH KERNEL
- export TARGET="amd64"
- export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
- # Avoid collision with TARGET and XDEV.
- unset TARGET TARGET_ARCH
- 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="RPI2"
- export CROCHETSRC="https://github.com/freebsd/crochet"
- export CROCHETBRANCH="trunk@rHEAD"
-}
-
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-rpi2"
+KERNEL="RPI2"
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index c3fff91694ae..a368ea5d90ff 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -3,35 +3,8 @@
# $FreeBSD$
#
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@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
- export TARGET="amd64"
- export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
- # Avoid collision with TARGET and XDEV.
- unset TARGET TARGET_ARCH
- 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/freebsd/crochet"
- export CROCHETBRANCH="trunk@rHEAD"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-wandboard"
+KERNEL="WANDBOARD-QUAD"
diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf
index 4d0a4615ba6b..8c08fb12d68c 100644
--- a/release/arm/ZEDBOARD.conf
+++ b/release/arm/ZEDBOARD.conf
@@ -3,34 +3,7 @@
# $FreeBSD$
#
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@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
- export TARGET="amd64"
- export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
- # Avoid collision with TARGET and XDEV.
- unset TARGET TARGET_ARCH
- 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/freebsd/crochet"
- export CROCHETBRANCH="trunk@rHEAD"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+KERNEL="ZEDBOARD"
diff --git a/release/release.sh b/release/release.sh
index 8ff974d68af3..a01277f24d26 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -285,6 +285,14 @@ extra_chroot_setup() {
chroot_build_target() {
buildenv_setup
load_target_env
+ if [ ! -z "${EMBEDDEDBUILD}" ]; then
+ RELEASE_WMAKEFLAGS="${RELEASE_WMAKEFLAGS} \
+ TARGET=${EMBEDDED_TARGET} \
+ TARGET_ARCH=${EMBEDDED_TARGET_ARCH}"
+ RELEASE_KMAKEFLAGS="${RELEASE_KMAKEFLAGS} \
+ TARGET=${EMBEDDED_TARGET} \
+ TARGET_ARCH=${EMBEDDED_TARGET_ARCH}"
+ fi
eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld
eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel