aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2021-03-16 16:01:48 +0000
committerGlen Barber <gjb@FreeBSD.org>2021-03-16 16:01:48 +0000
commit0af8a2db34cff008d4f48f357da48b7379b18893 (patch)
treed4ee310377f6a236f445f5096ac81685f47c8122 /release
parentc244b1d8a38731041d0f3ff4191192a85dd8608b (diff)
downloadsrc-0af8a2db34cff008d4f48f357da48b7379b18893.tar.gz
src-0af8a2db34cff008d4f48f357da48b7379b18893.zip
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")
Diffstat (limited to 'release')
-rwxr-xr-xrelease/release.sh7
1 files 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} \