From owner-svn-src-user@FreeBSD.ORG Sun Jan 26 01:27:55 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0419B423; Sun, 26 Jan 2014 01:27:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E3BAF1949; Sun, 26 Jan 2014 01:27:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0Q1RsFj026025; Sun, 26 Jan 2014 01:27:54 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0Q1Rs39026021; Sun, 26 Jan 2014 01:27:54 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201401260127.s0Q1Rs39026021@svn.freebsd.org> From: Glen Barber Date: Sun, 26 Jan 2014 01:27:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r261176 - in user/gjb/hacking/release-embedded/release: . arm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jan 2014 01:27:55 -0000 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@rHEAD" DOCBRANCH="doc/head@rHEAD" PORTBRANCH="ports/head@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@rHEAD" DOCBRANCH="doc/head@rHEAD" PORTBRANCH="ports/head@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@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} \