svn commit: r262713 - projects/release-embedded/release

[Glen Barber]

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 at 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}"