svn commit: r328429 - in stable: 10/release 11/release

[Glen Barber]

Author: gjb
Date: Fri Jan 26 04:32:31 2018
New Revision: 328429
URL: https://svnweb.freebsd.org/changeset/base/328429

Log:
  MFC r328283, r328284:
  
   r328283:
    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.
  
   r328284:
    Bump Copyright year.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/release.sh
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/release/release.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/release/release.sh
==============================================================================
--- stable/11/release/release.sh	Fri Jan 26 04:24:39 2018	(r328428)
+++ stable/11/release/release.sh	Fri Jan 26 04:32:31 2018	(r328429)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #-
-# Copyright (c) 2013-2017 The FreeBSD Foundation
+# Copyright (c) 2013-2018 The FreeBSD Foundation
 # Copyright (c) 2013 Glen Barber
 # Copyright (c) 2011 Nathan Whitehorn
 # All rights reserved.
@@ -201,6 +201,11 @@ env_check() {
 	if [ $(id -u) -ne 0 ]; then
 		echo "Needs to be run as root."
 		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} \