diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2021-03-16 16:01:48 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2021-04-29 15:45:46 +0000 |
| commit | 5a3548f2e28a7240138ea714e31ae9089f8a80be (patch) | |
| tree | 3d29bfe3747b3bc750e450d7440d436778bb4695 | |
| parent | 0490d82acef865eef70d3214f695c93b4cf3aef2 (diff) | |
| download | src-5a3548f2e28a7240138ea714e31ae9089f8a80be.tar.gz src-5a3548f2e28a7240138ea714e31ae9089f8a80be.zip | |
release: do not set __MAKE_CONF and SRCCONF for the chroot build
PR: 254319
Submitted by: truckman
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit 0af8a2db34cff008d4f48f357da48b7379b18893)
| -rwxr-xr-x | release/release.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/release/release.sh b/release/release.sh index 58f946b9bba1..0c38f2ed45b1 100755 --- a/release/release.sh +++ b/release/release.sh @@ -188,6 +188,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 @@ -211,9 +212,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} \ |