git: 0af8a2db34cf - main - release: do not set __MAKE_CONF and SRCCONF for the chroot build

[Glen Barber]

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=0af8a2db34cff008d4f48f357da48b7379b18893

commit 0af8a2db34cff008d4f48f357da48b7379b18893
Author:     Glen Barber <gjb at FreeBSD.org>
AuthorDate: 2021-03-16 16:01:48 +0000
Commit:     Glen Barber <gjb at FreeBSD.org>
CommitDate: 2021-03-16 16:01:48 +0000

    release: do not set __MAKE_CONF and SRCCONF for the chroot build
    
    PR:             254319
    Submitted by:   truckman
    MFC after:      1 week
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 release/release.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/release/release.sh b/release/release.sh
index 3d7612ef6b80..aa2ef4e6b3da 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -171,6 +171,7 @@ env_check() {
 	# this file, unless overridden by release.conf.  In most cases, these
 	# will not need to be changed.
 	CONF_FILES="__MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF}"
+	NOCONF_FILES="__MAKE_CONF=/dev/null SRCCONF=/dev/null"
 	if [ -n "${TARGET}" ] && [ -n "${TARGET_ARCH}" ]; then
 		ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
 	else
@@ -194,9 +195,9 @@ env_check() {
 
 	CHROOT_MAKEENV="${CHROOT_MAKEENV} \
 		MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
-	CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
-	CHROOT_IMAKEFLAGS="${WORLD_FLAGS} ${CONF_FILES}"
-	CHROOT_DMAKEFLAGS="${WORLD_FLAGS} ${CONF_FILES}"
+	CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${NOCONF_FILES}"
+	CHROOT_IMAKEFLAGS="${WORLD_FLAGS} ${NOCONF_FILES}"
+	CHROOT_DMAKEFLAGS="${WORLD_FLAGS} ${NOCONF_FILES}"
 	RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} \
 		${CONF_FILES}"
 	RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \