From owner-svn-src-all@freebsd.org  Sat Aug 29 15:13:08 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1962B3B30EC;
 Sat, 29 Aug 2020 15:13:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4Bf0Ml6vhWz4cQ1;
 Sat, 29 Aug 2020 15:13:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D048327B60;
 Sat, 29 Aug 2020 15:13:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07TFD7ph010786;
 Sat, 29 Aug 2020 15:13:07 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07TFD7gA010785;
 Sat, 29 Aug 2020 15:13:07 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <202008291513.07TFD7gA010785@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 29 Aug 2020 15:13:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r364956 - head/release
X-SVN-Group: head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: head/release
X-SVN-Commit-Revision: 364956
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Aug 2020 15:13:08 -0000

Author: gjb
Date: Sat Aug 29 15:13:07 2020
New Revision: 364956
URL: https://svnweb.freebsd.org/changeset/base/364956

Log:
  Install devel/git from packages if NOPORTS is set in the release.sh
  configuration file.
  
  Reported by:	Michael Butler
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Sat Aug 29 12:54:17 2020	(r364955)
+++ head/release/release.sh	Sat Aug 29 15:13:07 2020	(r364956)
@@ -282,6 +282,11 @@ extra_chroot_setup() {
 			WRKDIRPREFIX=/tmp/ports \
 			DISTDIR=/tmp/distfiles \
 			install clean distclean
+	else
+		eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
+			pkg install -y devel/git
+		eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
+			pkg clean -y
 	fi
 	if [ -d ${CHROOTDIR}/usr/ports ]; then
 		# Trick the ports 'run-autotools-fixup' target to do the right