From owner-svn-src-projects@FreeBSD.ORG  Mon Mar  3 15:58:43 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4632B774;
 Mon,  3 Mar 2014 15:58:43 +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 32EA88C6;
 Mon,  3 Mar 2014 15:58:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23Fwhcn087522;
 Mon, 3 Mar 2014 15:58:43 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23FwgNQ087520;
 Mon, 3 Mar 2014 15:58:42 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201403031558.s23FwgNQ087520@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 3 Mar 2014 15:58:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r262713 - projects/release-embedded/release
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 15:58:43 -0000

Author: gjb
Date: Mon Mar  3 15:58:42 2014
New Revision: 262713
URL: http://svnweb.freebsd.org/changeset/base/262713

Log:
  Remove the (very ugly) TARGET/TARGET_ARCH evaluation for i386
  on amd64 builds, and instead, allow specifying additional make(1)
  parameters to CHROOT_MAKEENV.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-embedded/release/release.conf.sample
  projects/release-embedded/release/release.sh

Modified: projects/release-embedded/release/release.conf.sample
==============================================================================
--- projects/release-embedded/release/release.conf.sample	Mon Mar  3 14:37:18 2014	(r262712)
+++ projects/release-embedded/release/release.conf.sample	Mon Mar  3 15:58:42 2014	(r262713)
@@ -55,3 +55,8 @@ PORTBRANCH="ports/head@rHEAD"
 ## step if it is expected the build environment will exist via alternate
 ## means.
 #CHROOTBUILD_SKIP=
+
+## Set to pass additional flags to make(1) for the build chroot setup, such
+## as TARGET/TARGET_ARCH.
+#CHROOT_MAKEENV=
+

Modified: projects/release-embedded/release/release.sh
==============================================================================
--- projects/release-embedded/release/release.sh	Mon Mar  3 14:37:18 2014	(r262712)
+++ projects/release-embedded/release/release.sh	Mon Mar  3 15:58:42 2014	(r262713)
@@ -146,14 +146,7 @@ if [ "x${TARGET}" != "x" ] && [ "x${TARG
 else
 	ARCH_FLAGS=
 fi
-CHROOT_MAKEENV="MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
-if [ ! -z ${TARGET} ] && [ ! -z ${TARGET_ARCH} ] && \
-	[ ${TARGET} = "i386" ] && \
-	[ ${TARGET_ARCH} = "i386" ] && \
-	[ "$(sysctl -n hw.machine)" = "amd64" ] && \
-	[ "$(sysctl -n hw.machine_arch)" = "amd64" ]; then
-		CHROOT_MAKEENV="${CHROOT_MAKEENV} TARGET=i386 TARGET_ARCH=i386"
-fi
+CHROOT_MAKEENV="${CHROOT_MAKEENV} MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
 CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
 CHROOT_IMAKEFLAGS="${CONF_FILES}"
 CHROOT_DMAKEFLAGS="${CONF_FILES}"