svn commit: r326412 - head/release

[Glen Barber]

Author: gjb
Date: Thu Nov 30 20:53:57 2017
New Revision: 326412
URL: https://svnweb.freebsd.org/changeset/base/326412

Log:
  Fix port build flags passed to make(1) after r326315, where
  it was missed for embedded image builds.
  
  MFC after:	3 days
  MFC with:	r326315
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Thu Nov 30 20:52:01 2017	(r326411)
+++ head/release/release.sh	Thu Nov 30 20:53:57 2017	(r326412)
@@ -282,8 +282,9 @@ extra_chroot_setup() {
 			PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
 			PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports"
 			PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
-			chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
-				${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
+			chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \
+				/usr/ports/textproc/docproj \
+				OPTIONS_UNSET="FOP IGOR" \
 				FORCE_PKG_REGISTER=1 \
 				install clean distclean
 		fi
@@ -296,9 +297,12 @@ extra_chroot_setup() {
 		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
 		PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
 		PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
+		PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports"
+		PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
 		for _PORT in ${EMBEDDEDPORTS}; do
-			eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
-				FORCE_PKG_REGISTER=1 ${PBUILD_FLAGS} install clean distclean
+			eval chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \
+				/usr/ports/${_PORT} \
+				FORCE_PKG_REGISTER=1 install clean distclean
 		done
 	fi