svn commit: r264960 - stable/9/release/arm

[Glen Barber]

Author: gjb
Date: Sat Apr 26 00:55:36 2014
New Revision: 264960
URL: http://svnweb.freebsd.org/changeset/base/264960

Log:
  MFC r264794:
    Move xdev knobs from release/arm/release.sh and into an
    XDEV_FLAGS variable in ${KERNCONF}.conf file.
  
  Local changes:
    Fix XDEV_FLAGS for stable/9 branch, in particular, remove
    all *_CLANG* knobs, and move WITH_GCC=1 to XDEV_FLAGS.
    This is effectively a no-op on stable/9, and merged for
    tracking purpose only.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/9/release/arm/BEAGLEBONE.conf
  stable/9/release/arm/PANDABOARD.conf
  stable/9/release/arm/RPI-B.conf
  stable/9/release/arm/WANDBOARD-QUAD.conf
  stable/9/release/arm/ZEDBOARD.conf
  stable/9/release/arm/release.sh
Directory Properties:
  stable/9/release/   (props changed)

Modified: stable/9/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/9/release/arm/BEAGLEBONE.conf	Sat Apr 26 00:51:07 2014	(r264959)
+++ stable/9/release/arm/BEAGLEBONE.conf	Sat Apr 26 00:55:36 2014	(r264960)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
 EMBEDDEDPORTS="lang/python textproc/gsed"
 XDEV="arm"
 XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1"
 KERNEL="BEAGLEBONE"
 CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
 CROCHETBRANCH="trunk"

Modified: stable/9/release/arm/PANDABOARD.conf
==============================================================================
--- stable/9/release/arm/PANDABOARD.conf	Sat Apr 26 00:51:07 2014	(r264959)
+++ stable/9/release/arm/PANDABOARD.conf	Sat Apr 26 00:55:36 2014	(r264960)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
 EMBEDDEDPORTS="lang/python textproc/gsed"
 XDEV="arm"
 XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1"
 KERNEL="PANDABOARD"
 CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
 CROCHETBRANCH="trunk"

Modified: stable/9/release/arm/RPI-B.conf
==============================================================================
--- stable/9/release/arm/RPI-B.conf	Sat Apr 26 00:51:07 2014	(r264959)
+++ stable/9/release/arm/RPI-B.conf	Sat Apr 26 00:55:36 2014	(r264960)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
 EMBEDDEDPORTS="lang/python textproc/gsed"
 XDEV="arm"
 XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1"
 KERNEL="RPI-B"
 CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
 CROCHETBRANCH="trunk"

Modified: stable/9/release/arm/WANDBOARD-QUAD.conf
==============================================================================
--- stable/9/release/arm/WANDBOARD-QUAD.conf	Sat Apr 26 00:51:07 2014	(r264959)
+++ stable/9/release/arm/WANDBOARD-QUAD.conf	Sat Apr 26 00:55:36 2014	(r264960)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
 EMBEDDEDPORTS="lang/python textproc/gsed"
 XDEV="arm"
 XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1"
 KERNEL="WANDBOARD-QUAD"
 CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
 CROCHETBRANCH="trunk"

Modified: stable/9/release/arm/ZEDBOARD.conf
==============================================================================
--- stable/9/release/arm/ZEDBOARD.conf	Sat Apr 26 00:51:07 2014	(r264959)
+++ stable/9/release/arm/ZEDBOARD.conf	Sat Apr 26 00:55:36 2014	(r264960)
@@ -21,6 +21,7 @@ CHROOTDIR="/scratch"
 EMBEDDEDBUILD=1
 XDEV="arm"
 XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1"
 KERNEL="ZEDBOARD"
 CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
 CROCHETBRANCH="trunk"

Modified: stable/9/release/arm/release.sh
==============================================================================
--- stable/9/release/arm/release.sh	Sat Apr 26 00:51:07 2014	(r264959)
+++ stable/9/release/arm/release.sh	Sat Apr 26 00:55:36 2014	(r264960)
@@ -99,7 +99,7 @@ main() {
 		WITH_GCC=1 ${WORLD_FLAGS} -j1 obj depend all install
 	# Build the 'xdev' target for crochet.
 	eval chroot ${CHROOTDIR} make -C /usr/src \
-		XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} WITH_GCC=1 \
+		${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
 		${WORLD_FLAGS} xdev
 
 	# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints