svn commit: r264441 - in stable/9: release share/man/man7

[Glen Barber]

Author: gjb
Date: Mon Apr 14 03:58:18 2014
New Revision: 264441
URL: http://svnweb.freebsd.org/changeset/base/264441

Log:
  MFC r264343:
    Add SRC_UPDATE_SKIP, DOC_UPDATE_SKIP, and PORTS_UPDATE_SKIP
    variables.  These are intended to allow bypassing the
    'svn co /usr/{src,doc,ports}' step in the chroot when the
    tree exists from external means.
  
    The use case here is that /usr/src, /usr/doc, and /usr/ports
    in the chroot exist as result of zfs dataset clones, so it
    is possible (and happens quite often) that the included
    distributions may not be consistent.  (This is not the case
    for -RELEASE builds, but does happen for snapshot builds.)
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/9/release/release.conf.sample
  stable/9/release/release.sh
  stable/9/share/man/man7/release.7
Directory Properties:
  stable/9/release/   (props changed)
  stable/9/share/man/man7/   (props changed)

Modified: stable/9/release/release.conf.sample
==============================================================================
--- stable/9/release/release.conf.sample	Mon Apr 14 03:57:45 2014	(r264440)
+++ stable/9/release/release.conf.sample	Mon Apr 14 03:58:18 2014	(r264441)
@@ -56,6 +56,18 @@ PORTBRANCH="ports/head at rHEAD"
 ## means.
 #CHROOTBUILD_SKIP=
 
+## Set to a non-empty value skip checkout or update of /usr/src in
+## the chroot.  This is intended for use when /usr/src already exists.
+#SRC_UPDATE_SKIP=
+
+## Set to a non-empty value skip checkout or update of /usr/doc in
+## the chroot.  This is intended for use when /usr/doc already exists.
+#DOC_UPDATE_SKIP=
+
+## Set to a non-empty value skip checkout or update of /usr/ports in
+## the chroot.  This is intended for use when /usr/ports already exists.
+#PORTS_UPDATE_SKIP=
+
 ## Set to pass additional flags to make(1) for the build chroot setup, such
 ## as TARGET/TARGET_ARCH.
 #CHROOT_MAKEENV=

Modified: stable/9/release/release.sh
==============================================================================
--- stable/9/release/release.sh	Mon Apr 14 03:57:45 2014	(r264440)
+++ stable/9/release/release.sh	Mon Apr 14 03:58:18 2014	(r264441)
@@ -190,11 +190,13 @@ set -e # Everything must succeed
 
 mkdir -p ${CHROOTDIR}/usr
 
-${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src
-if [ -z "${NODOC}" ]; then
+if [ -z "${SRC_UPDATE_SKIP}" ]; then
+	${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src
+fi
+if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
 	${VCSCMD} ${DOCBRANCH} ${CHROOTDIR}/usr/doc
 fi
-if [ -z "${NOPORTS}" ]; then
+if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
 	${VCSCMD} ${PORTBRANCH} ${CHROOTDIR}/usr/ports
 fi
 

Modified: stable/9/share/man/man7/release.7
==============================================================================
--- stable/9/share/man/man7/release.7	Mon Apr 14 03:57:45 2014	(r264440)
+++ stable/9/share/man/man7/release.7	Mon Apr 14 03:58:18 2014	(r264441)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 2, 2014
+.Dd April 11, 2014
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -272,6 +272,30 @@ build environment setup are skipped.
 This is intended solely for cases where the
 .Xr chroot 8
 userland are provided by alternate means.
+.It Va SRC_UPDATE_SKIP
+Set to a non-empty value to prevent checkout or update of
+.Fa /usr/src
+within the
+.Xr chroot 8 .
+This is intended for use only when
+.Fa /usr/src
+is expected to exist by alternative means.
+.It Va DOC_UPDATE_SKIP
+Set to a non-empty value to prevent checkout or update of
+.Fa /usr/doc
+within the
+.Xr chroot 8 .
+This is intended for use only when
+.Fa /usr/doc
+is expected to exist by alternative means.
+.It Va PORTS_UPDATE_SKIP
+Set to a non-empty value to prevent checkout or update of
+.Fa /usr/ports
+within the
+.Xr chroot 8 .
+This is intended for use only when
+.Fa /usr/ports
+is expected to exist by alternative means.
 .El
 .Sh EMBEDDED BUILDS
 The following