diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2014-04-23 02:01:22 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2014-04-23 02:01:22 +0000 |
| commit | 192daa5d18d4295137e3afb32df250af350194b6 (patch) | |
| tree | b47d453965ffcd96e386d381c01ed49d7dcfaf8f | |
| parent | 70ba1fc251aa3e2a92d9d6d7e8bec378106fa681 (diff) | |
| download | src-192daa5d18d4295137e3afb32df250af350194b6.tar.gz src-192daa5d18d4295137e3afb32df250af350194b6.zip | |
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
Notes
Notes:
svn path=/head/; revision=264794
| -rw-r--r-- | release/arm/BEAGLEBONE.conf | 1 | ||||
| -rw-r--r-- | release/arm/PANDABOARD.conf | 1 | ||||
| -rw-r--r-- | release/arm/RPI-B.conf | 1 | ||||
| -rw-r--r-- | release/arm/WANDBOARD-QUAD.conf | 1 | ||||
| -rw-r--r-- | release/arm/ZEDBOARD.conf | 1 | ||||
| -rwxr-xr-x | release/arm/release.sh | 3 |
6 files changed, 6 insertions, 2 deletions
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf index c71eba864c69..49c02249dc4f 100644 --- a/release/arm/BEAGLEBONE.conf +++ b/release/arm/BEAGLEBONE.conf @@ -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" diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf index 48021ec55f65..d932dac9c849 100644 --- a/release/arm/PANDABOARD.conf +++ b/release/arm/PANDABOARD.conf @@ -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" diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf index 840a29aba41c..01137c06244d 100644 --- a/release/arm/RPI-B.conf +++ b/release/arm/RPI-B.conf @@ -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" diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf index 3e6e7ec2ac0f..15c257f4ea4c 100644 --- a/release/arm/WANDBOARD-QUAD.conf +++ b/release/arm/WANDBOARD-QUAD.conf @@ -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" diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf index 19fb96738d8d..a1b8ebf3d18a 100644 --- a/release/arm/ZEDBOARD.conf +++ b/release/arm/ZEDBOARD.conf @@ -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" diff --git a/release/arm/release.sh b/release/arm/release.sh index 0eba0d7932bc..c2b2a1b30755 100755 --- a/release/arm/release.sh +++ b/release/arm/release.sh @@ -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 |