svn commit: r261448 - in user/gjb/hacking/release-embedded/release: arm tools/arm

[Glen Barber]

Author: gjb
Date: Mon Feb  3 22:51:30 2014
New Revision: 261448
URL: http://svnweb.freebsd.org/changeset/base/261448

Log:
  Export WORLD_FLAGS and KERNEL_FLAGS for buildworld/buildkernel.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/hacking/release-embedded/release/arm/BEAGLEBONE.conf
  user/gjb/hacking/release-embedded/release/arm/PANDABOARD.conf
  user/gjb/hacking/release-embedded/release/arm/RPI-B.conf
  user/gjb/hacking/release-embedded/release/tools/arm/crochet-BEAGLEBONE.conf
  user/gjb/hacking/release-embedded/release/tools/arm/crochet-PANDABOARD.conf
  user/gjb/hacking/release-embedded/release/tools/arm/crochet-RPI-B.conf

Modified: user/gjb/hacking/release-embedded/release/arm/BEAGLEBONE.conf
==============================================================================
--- user/gjb/hacking/release-embedded/release/arm/BEAGLEBONE.conf	Mon Feb  3 22:16:46 2014	(r261447)
+++ user/gjb/hacking/release-embedded/release/arm/BEAGLEBONE.conf	Mon Feb  3 22:51:30 2014	(r261448)
@@ -23,6 +23,8 @@ NODOC=yes
 # 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 $(expr \( $(sysctl -n hw.ncpu) + 1 \) / 2)"
 CHROOTDIR="/scratch"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="lang/python textproc/gsed"

Modified: user/gjb/hacking/release-embedded/release/arm/PANDABOARD.conf
==============================================================================
--- user/gjb/hacking/release-embedded/release/arm/PANDABOARD.conf	Mon Feb  3 22:16:46 2014	(r261447)
+++ user/gjb/hacking/release-embedded/release/arm/PANDABOARD.conf	Mon Feb  3 22:51:30 2014	(r261448)
@@ -23,6 +23,8 @@ NODOC=yes
 # 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 $(expr \( $(sysctl -n hw.ncpu) + 1 \) / 2)"
 CHROOTDIR="/scratch"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="lang/python textproc/gsed"

Modified: user/gjb/hacking/release-embedded/release/arm/RPI-B.conf
==============================================================================
--- user/gjb/hacking/release-embedded/release/arm/RPI-B.conf	Mon Feb  3 22:16:46 2014	(r261447)
+++ user/gjb/hacking/release-embedded/release/arm/RPI-B.conf	Mon Feb  3 22:51:30 2014	(r261448)
@@ -23,6 +23,8 @@ NODOC=yes
 # 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 $(expr \( $(sysctl -n hw.ncpu) + 1 \) / 2)"
 CHROOTDIR="/scratch"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="lang/python textproc/gsed"

Modified: user/gjb/hacking/release-embedded/release/tools/arm/crochet-BEAGLEBONE.conf
==============================================================================
--- user/gjb/hacking/release-embedded/release/tools/arm/crochet-BEAGLEBONE.conf	Mon Feb  3 22:16:46 2014	(r261447)
+++ user/gjb/hacking/release-embedded/release/tools/arm/crochet-BEAGLEBONE.conf	Mon Feb  3 22:51:30 2014	(r261448)
@@ -19,9 +19,9 @@ _REVISION=$(make -C ${FREEBSD_SRC}/relea
 KERNCONF=BEAGLEBONE
 TARGET=arm
 TARGET_ARCH=armv6
-FREEBSD_BUILDWORLD_EXTRA_ARGS=""
+FREEBSD_BUILDWORLD_EXTRA_ARGS="${WORLD_FLAGS}"
+FREEBSD_BUILDKERNEL_EXTRA_ARGS="${KERNEL_FLAGS}"
 FREEBSD_INSTALLWORLD_EXTRA_ARGS=""
-FREEBSD_BUILDKERNEL_EXTRA_ARGS=""
 FREEBSD_INSTALLKERNEL_EXTRA_ARGS=""
 FREEBSD_WORLD_EXTRA_ARGS=""
 FREEBSD_KERNEL_EXTRA_ARGS=""

Modified: user/gjb/hacking/release-embedded/release/tools/arm/crochet-PANDABOARD.conf
==============================================================================
--- user/gjb/hacking/release-embedded/release/tools/arm/crochet-PANDABOARD.conf	Mon Feb  3 22:16:46 2014	(r261447)
+++ user/gjb/hacking/release-embedded/release/tools/arm/crochet-PANDABOARD.conf	Mon Feb  3 22:51:30 2014	(r261448)
@@ -19,9 +19,9 @@ _REVISION=$(make -C ${FREEBSD_SRC}/relea
 KERNCONF=PANDABOARD
 TARGET=arm
 TARGET_ARCH=armv6
-FREEBSD_BUILDWORLD_EXTRA_ARGS=""
+FREEBSD_BUILDWORLD_EXTRA_ARGS="${WORLD_FLAGS}"
+FREEBSD_BUILDKERNEL_EXTRA_ARGS="${KERNEL_FLAGS}"
 FREEBSD_INSTALLWORLD_EXTRA_ARGS=""
-FREEBSD_BUILDKERNEL_EXTRA_ARGS=""
 FREEBSD_INSTALLKERNEL_EXTRA_ARGS=""
 FREEBSD_WORLD_EXTRA_ARGS=""
 FREEBSD_KERNEL_EXTRA_ARGS=""

Modified: user/gjb/hacking/release-embedded/release/tools/arm/crochet-RPI-B.conf
==============================================================================
--- user/gjb/hacking/release-embedded/release/tools/arm/crochet-RPI-B.conf	Mon Feb  3 22:16:46 2014	(r261447)
+++ user/gjb/hacking/release-embedded/release/tools/arm/crochet-RPI-B.conf	Mon Feb  3 22:51:30 2014	(r261448)
@@ -19,9 +19,9 @@ _REVISION=$(make -C ${FREEBSD_SRC}/relea
 KERNCONF=RPI-B
 TARGET=arm
 TARGET_ARCH=armv6
-FREEBSD_BUILDWORLD_EXTRA_ARGS=""
+FREEBSD_BUILDWORLD_EXTRA_ARGS="${WORLD_FLAGS}"
+FREEBSD_BUILDKERNEL_EXTRA_ARGS="${KERNEL_FLAGS}"
 FREEBSD_INSTALLWORLD_EXTRA_ARGS=""
-FREEBSD_BUILDKERNEL_EXTRA_ARGS=""
 FREEBSD_INSTALLKERNEL_EXTRA_ARGS=""
 FREEBSD_WORLD_EXTRA_ARGS=""
 FREEBSD_KERNEL_EXTRA_ARGS=""