diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2014-01-26 01:27:53 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2014-01-26 01:27:53 +0000 |
| commit | 3da86361451d6d2f8b00de247c97bb52546dc7ed (patch) | |
| tree | 1181fce5ddabd10618725441c081388bd8ff3fd8 /release | |
| parent | f8089757bb542ae063e83c9a04c9446966fab5dc (diff) | |
| download | src-3da86361451d6d2f8b00de247c97bb52546dc7ed.tar.gz src-3da86361451d6d2f8b00de247c97bb52546dc7ed.zip | |
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
Notes
Notes:
svn path=/user/gjb/hacking/release-embedded/; revision=261176
Diffstat (limited to 'release')
| -rw-r--r-- | release/arm/BEAGLEBONE.conf | 1 | ||||
| -rw-r--r-- | release/arm/RPI-B.conf | 1 | ||||
| -rwxr-xr-x | release/arm/release.sh | 3 | ||||
| -rwxr-xr-x | release/release.sh | 7 |
4 files changed, 6 insertions, 6 deletions
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf index 7778bc851d17..e164f582b8f8 100644 --- a/release/arm/BEAGLEBONE.conf +++ b/release/arm/BEAGLEBONE.conf @@ -17,7 +17,6 @@ SVNROOT="svn://svn.FreeBSD.org" SRCBRANCH="base/head@rHEAD" DOCBRANCH="doc/head@rHEAD" PORTBRANCH="ports/head@rHEAD" -EMBEDDED_WORLD_FLAGS="WITH_GCC=1" NODOC=yes # Build target configuration diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf index 4952e289f90b..c3e5248db00c 100644 --- a/release/arm/RPI-B.conf +++ b/release/arm/RPI-B.conf @@ -17,7 +17,6 @@ SVNROOT="svn://svn.FreeBSD.org" SRCBRANCH="base/head@rHEAD" DOCBRANCH="doc/head@rHEAD" PORTBRANCH="ports/head@rHEAD" -EMBEDDED_WORLD_FLAGS="WITH_GCC=1" NODOC=yes # Build target configuration diff --git a/release/arm/release.sh b/release/arm/release.sh index 037d288c2175..6703f38f8687 100755 --- a/release/arm/release.sh +++ b/release/arm/release.sh @@ -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 diff --git a/release/release.sh b/release/release.sh index c4b68d8fd800..3fc264f86cc3 100755 --- a/release/release.sh +++ b/release/release.sh @@ -48,7 +48,6 @@ PORTBRANCH="ports/head@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} \ |