diff options
| author | gjb <gjb@FreeBSD.org> | 2014-04-11 13:48:45 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-04-11 13:48:45 +0000 |
| commit | 8606a0a99229f94cd3ce133f24747c5951bb7a94 (patch) | |
| tree | eae2a2737d25e719aa32f2af2f9457d10a767e89 /release/release.sh | |
| parent | 3bdbc6b29ab43297f73936f1ce67d7c419c96167 (diff) | |
| download | FreeBSD-src-8606a0a99229f94cd3ce133f24747c5951bb7a94.zip FreeBSD-src-8606a0a99229f94cd3ce133f24747c5951bb7a94.tar.gz | |
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.)
Tested on: stable/9@r264319
MFC After: 3 days
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/release.sh')
| -rwxr-xr-x | release/release.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/release/release.sh b/release/release.sh index 11df3fd..73b706e 100755 --- a/release/release.sh +++ b/release/release.sh @@ -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 |
