svn commit: r264794 - head/release/arm

[Warner Losh]

Ditto. This should be backed out and you should make whoever broke this fix it in head.

Warner

On Apr 22, 2014, at 7:01 PM, Glen Barber <gjb at freebsd.org> wrote:

> Author: gjb
> Date: Wed Apr 23 02:01:22 2014
> New Revision: 264794
> URL: http://svnweb.freebsd.org/changeset/base/264794
> 
> Log:
>  Move xdev knobs from release/arm/release.sh and into an
>  XDEV_FLAGS variable in ${KERNCONF}.conf file.
> 
>  MFC after:	3 days
>  X-MFC-Note:	fix stable/10 XDEV_FLAGS local for branch
>  Sponsored by:	The FreeBSD Foundation
> 
> Modified:
>  head/release/arm/BEAGLEBONE.conf
>  head/release/arm/PANDABOARD.conf
>  head/release/arm/RPI-B.conf
>  head/release/arm/WANDBOARD-QUAD.conf
>  head/release/arm/ZEDBOARD.conf
>  head/release/arm/release.sh
> 
> Modified: head/release/arm/BEAGLEBONE.conf
> ==============================================================================
> --- head/release/arm/BEAGLEBONE.conf	Wed Apr 23 01:47:07 2014	(r264793)
> +++ head/release/arm/BEAGLEBONE.conf	Wed Apr 23 02:01:22 2014	(r264794)
> @@ -22,6 +22,7 @@ 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"
> 
> Modified: head/release/arm/PANDABOARD.conf
> ==============================================================================
> --- head/release/arm/PANDABOARD.conf	Wed Apr 23 01:47:07 2014	(r264793)
> +++ head/release/arm/PANDABOARD.conf	Wed Apr 23 02:01:22 2014	(r264794)
> @@ -22,6 +22,7 @@ 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"
> 
> Modified: head/release/arm/RPI-B.conf
> ==============================================================================
> --- head/release/arm/RPI-B.conf	Wed Apr 23 01:47:07 2014	(r264793)
> +++ head/release/arm/RPI-B.conf	Wed Apr 23 02:01:22 2014	(r264794)
> @@ -22,6 +22,7 @@ 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"
> 
> Modified: head/release/arm/WANDBOARD-QUAD.conf
> ==============================================================================
> --- head/release/arm/WANDBOARD-QUAD.conf	Wed Apr 23 01:47:07 2014	(r264793)
> +++ head/release/arm/WANDBOARD-QUAD.conf	Wed Apr 23 02:01:22 2014	(r264794)
> @@ -22,6 +22,7 @@ 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"
> 
> Modified: head/release/arm/ZEDBOARD.conf
> ==============================================================================
> --- head/release/arm/ZEDBOARD.conf	Wed Apr 23 01:47:07 2014	(r264793)
> +++ head/release/arm/ZEDBOARD.conf	Wed Apr 23 02:01:22 2014	(r264794)
> @@ -21,6 +21,7 @@ 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"
> 
> Modified: head/release/arm/release.sh
> ==============================================================================
> --- head/release/arm/release.sh	Wed Apr 23 01:47:07 2014	(r264793)
> +++ head/release/arm/release.sh	Wed Apr 23 02:01:22 2014	(r264794)
> @@ -94,8 +94,7 @@ install_uboot() {
> main() {
> 	# Build the 'xdev' target for crochet.
> 	eval chroot ${CHROOTDIR} make -C /usr/src \
> -		WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1 \
> -		XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
> +		${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
> 		${WORLD_FLAGS} xdev
> 
> 	# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
>