aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2018-01-23 16:41:31 +0000
committerGlen Barber <gjb@FreeBSD.org>2018-01-23 16:41:31 +0000
commitafac3ed6c3bb221bbee6deb8bc76a1930e1e40ad (patch)
treea0e916065307d86c14266f4cc5c1f4337e28ee27 /release/release.sh
parentdfb1d80f645bfdab6246e2ceacb3a212a310938e (diff)
downloadsrc-afac3ed6c3bb221bbee6deb8bc76a1930e1e40ad.tar.gz
src-afac3ed6c3bb221bbee6deb8bc76a1930e1e40ad.zip
When CHROOTBUILD_SKIP is set, evaluate the existence of /bin/sh
within the CHROOTDIR. If it does not exist, unset CHROOTBUILD_SKIP to prevent build failures. Requested by: swills MFC after: 3 days Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=328283
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/release/release.sh b/release/release.sh
index d1afbf57011e..da8fe2890b80 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -203,6 +203,11 @@ env_check() {
exit 1
fi
+ # Unset CHROOTBUILD_SKIP if the chroot(8) does not appear to exist.
+ if [ ! -z "${CHROOTBUILD_SKIP}" -a ! -e ${CHROOTDIR}/bin/sh ]; then
+ CHROOTBUILD_SKIP=
+ fi
+
CHROOT_MAKEENV="${CHROOT_MAKEENV} \
MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"