svn commit: r349160 - in head/release: . tools

[Glen Barber]

Author: gjb
Date: Mon Jun 17 22:53:39 2019
New Revision: 349160
URL: https://svnweb.freebsd.org/changeset/base/349160

Log:
  Fix passing ${CONF_FILES} (which contains MAKE_CONF and
  SRC_CONF, __MAKE_CONF and SRCCONF, respectively) through
  to arm_install_base() and chroot_arm_build_release().
  This prevents failures when the target image is intended
  to be build with make.conf(5) and src.conf(5) overrides,
  which are correctly handled for non-embedded image builds.
  
  Reported and tested by:	Daniel Engberg
  PR:		238615
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/release.sh
  head/release/tools/arm.subr

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Mon Jun 17 22:13:59 2019	(r349159)
+++ head/release/release.sh	Mon Jun 17 22:53:39 2019	(r349160)
@@ -388,6 +388,7 @@ chroot_arm_build_release() {
 	[ ! -z "${RELEASECONF}" ] && . "${RELEASECONF}"
 	export MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}"
 	export MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}"
+	export MAKE_FLAGS="${MAKE_FLAGS} ${CONF_FILES}"
 	eval chroot ${CHROOTDIR} env WITH_UNIFIED_OBJDIR=1 make ${MAKE_FLAGS} -C /usr/src/release obj
 	export WORLDDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V WORLDDIR)"
 	export OBJDIR="$(eval chroot ${CHROOTDIR} env WITH_UNIFIED_OBJDIR=1 make ${MAKE_FLAGS} -C /usr/src/release -V .OBJDIR)"

Modified: head/release/tools/arm.subr
==============================================================================
--- head/release/tools/arm.subr	Mon Jun 17 22:13:59 2019	(r349159)
+++ head/release/tools/arm.subr	Mon Jun 17 22:53:39 2019	(r349160)
@@ -166,7 +166,7 @@ arm_install_base() {
 		TARGET=${EMBEDDED_TARGET} \
 		TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 		DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \
-		installworld installkernel distribution
+		${CONF_FILES} installworld installkernel distribution
 	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos
 
 	arm_create_user