svn commit: r325366 - head/release

[Glen Barber]

Author: gjb
Date: Fri Nov  3 18:54:25 2017
New Revision: 325366
URL: https://svnweb.freebsd.org/changeset/base/325366

Log:
  Include TARGET and TARGET_ARCH in chroot_arm_build_release()
  make(1) invocations following the OBJDIR restructuring to
  ensure the output arm SoC image is in the correct directory.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Fri Nov  3 17:04:30 2017	(r325365)
+++ head/release/release.sh	Fri Nov  3 18:54:25 2017	(r325366)
@@ -350,7 +350,9 @@ chroot_build_release() {
 # chroot_arm_build_release(): Create arm SD card image.
 chroot_arm_build_release() {
 	load_target_env
-	eval chroot ${CHROOTDIR} make -C /usr/src/release obj
+	MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}"
+	MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}"
+	eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release obj
 	case ${EMBEDDED_TARGET} in
 		arm|arm64)
 			if [ -e "${RELENGDIR}/tools/arm.subr" ]; then
@@ -361,11 +363,11 @@ chroot_arm_build_release() {
 			;;
 	esac
 	[ ! -z "${RELEASECONF}" ] && . "${RELEASECONF}"
-	WORLDDIR="$(eval chroot ${CHROOTDIR} make -C /usr/src/release -V WORLDDIR)"
-	OBJDIR="$(eval chroot ${CHROOTDIR} make -C /usr/src/release -V .OBJDIR)"
+	WORLDDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V WORLDDIR)"
+	OBJDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V .OBJDIR)"
 	DESTDIR="${OBJDIR}/${KERNEL}"
 	IMGBASE="${CHROOTDIR}/${OBJDIR}/${KERNEL}.img"
-	OSRELEASE="$(eval chroot ${CHROOTDIR} make -C /usr/src/release \
+	OSRELEASE="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release \
 		TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 		-V OSRELEASE)"
 	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}