svn commit: r261176 - in user/gjb/hacking/release-embedded/release: . arm

[Glen Barber]

Author: gjb
Date: Sun Jan 26 01:27:53 2014
New Revision: 261176
URL: http://svnweb.freebsd.org/changeset/base/261176

Log:
  Remove EMBEDDED_WORLD_FLAGS from release.sh, and move the gcc(1)
  build to arm/release.sh.
  
  This prevents needing to build a separate chroot environment for
  the arm/armv6 builds when it is not absolutely necessary.  This
  is useful for situations where a single userland build is used
  to populate more than one chroot.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/hacking/release-embedded/release/arm/BEAGLEBONE.conf
  user/gjb/hacking/release-embedded/release/arm/RPI-B.conf
  user/gjb/hacking/release-embedded/release/arm/release.sh
  user/gjb/hacking/release-embedded/release/release.sh

Modified: user/gjb/hacking/release-embedded/release/arm/BEAGLEBONE.conf
==============================================================================
--- user/gjb/hacking/release-embedded/release/arm/BEAGLEBONE.conf	Sun Jan 26 00:37:21 2014	(r261175)
+++ user/gjb/hacking/release-embedded/release/arm/BEAGLEBONE.conf	Sun Jan 26 01:27:53 2014	(r261176)
@@ -17,7 +17,6 @@ SVNROOT="svn://svn.FreeBSD.org"
 SRCBRANCH="base/head at rHEAD"
 DOCBRANCH="doc/head at rHEAD"
 PORTBRANCH="ports/head at rHEAD"
-EMBEDDED_WORLD_FLAGS="WITH_GCC=1"
 NODOC=yes
 
 # Build target configuration

Modified: user/gjb/hacking/release-embedded/release/arm/RPI-B.conf
==============================================================================
--- user/gjb/hacking/release-embedded/release/arm/RPI-B.conf	Sun Jan 26 00:37:21 2014	(r261175)
+++ user/gjb/hacking/release-embedded/release/arm/RPI-B.conf	Sun Jan 26 01:27:53 2014	(r261176)
@@ -17,7 +17,6 @@ SVNROOT="svn://svn.FreeBSD.org"
 SRCBRANCH="base/head at rHEAD"
 DOCBRANCH="doc/head at rHEAD"
 PORTBRANCH="ports/head at rHEAD"
-EMBEDDED_WORLD_FLAGS="WITH_GCC=1"
 NODOC=yes
 
 # Build target configuration

Modified: user/gjb/hacking/release-embedded/release/arm/release.sh
==============================================================================
--- user/gjb/hacking/release-embedded/release/arm/release.sh	Sun Jan 26 00:37:21 2014	(r261175)
+++ user/gjb/hacking/release-embedded/release/arm/release.sh	Sun Jan 26 01:27:53 2014	(r261176)
@@ -48,6 +48,9 @@ install_uboot() {
 }
 
 main() {
+	# Build gcc for use in the chroot for arm builds.
+	eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/cc \
+		WITH_GCC=1 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

Modified: user/gjb/hacking/release-embedded/release/release.sh
==============================================================================
--- user/gjb/hacking/release-embedded/release/release.sh	Sun Jan 26 00:37:21 2014	(r261175)
+++ user/gjb/hacking/release-embedded/release/release.sh	Sun Jan 26 01:27:53 2014	(r261176)
@@ -48,7 +48,6 @@ PORTBRANCH="ports/head at rHEAD"
 
 # Set for embedded device builds.
 EMBEDDEDBUILD=
-EMBEDDED_WORLD_FLAGS=
 
 # Sometimes one needs to checkout src with --force svn option.
 # If custom kernel configs copied to src tree before checkout, e.g.
@@ -137,9 +136,9 @@ else
 	ARCH_FLAGS=
 fi
 CHROOT_MAKEENV="MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
-CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES} ${EMBEDDED_WORLD_FLAGS}"
-CHROOT_IMAKEFLAGS="${CONF_FILES} ${EMBEDDED_WORLD_FLAGS}"
-CHROOT_DMAKEFLAGS="${CONF_FILES} ${EMBEDDED_WORLD_FLAGS}"
+CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
+CHROOT_IMAKEFLAGS="${CONF_FILES}"
+CHROOT_DMAKEFLAGS="${CONF_FILES}"
 RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}"
 RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
 RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \