Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Jan 2018 16:41:31 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r328283 - head/release
Message-ID:  <201801231641.w0NGfVTG050316@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Tue Jan 23 16:41:31 2018
New Revision: 328283
URL: https://svnweb.freebsd.org/changeset/base/328283

Log:
  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

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Tue Jan 23 15:34:34 2018	(r328282)
+++ head/release/release.sh	Tue Jan 23 16:41:31 2018	(r328283)
@@ -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}"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801231641.w0NGfVTG050316>