Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Apr 2021 15:32:21 GMT
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 5950b9cdbba2 - stable/13 - release.sh: Skip installing textproc/docproj when NODOC is set
Message-ID:  <202104291532.13TFWL2l032886@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=5950b9cdbba29ebd1b33be9e52cd9d26d732481b

commit 5950b9cdbba29ebd1b33be9e52cd9d26d732481b
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-03 00:04:11 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-04-29 15:24:03 +0000

    release.sh: Skip installing textproc/docproj when NODOC is set
    
    PR:             253192
    Submitted by:   Yasuhiro Kimura
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit 805e2876ec20f89e45f0f9f4164f31b6711ff0ea)
---
 release/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/release.sh b/release/release.sh
index 8294eaef6f00..58f946b9bba1 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -326,7 +326,7 @@ extra_chroot_setup() {
 				pkg clean -y
 		fi
 	fi
-	if [ -d ${CHROOTDIR}/usr/ports ]; then
+	if [ -z "${NODOC}" ] && [ -d ${CHROOTDIR}/usr/ports ]; then
 		# Trick the ports 'run-autotools-fixup' target to do the right
 		# thing.
 		_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)



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