git: 6462113b7012 - main - release.sh: fix OSVERSION and UNAME_r overrides

[Glen Barber]

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=6462113b7012025c2d88451c1795368ef0607deb

commit 6462113b7012025c2d88451c1795368ef0607deb
Author:     Glen Barber <gjb at FreeBSD.org>
AuthorDate: 2021-02-11 15:46:38 +0000
Commit:     Glen Barber <gjb at FreeBSD.org>
CommitDate: 2021-02-11 15:46:38 +0000

    release.sh: fix OSVERSION and UNAME_r overrides
    
    Add PBUILD_FLAGS and UNAME_r overrides to extra_chroot_setup()
    to fix building ports for 14-CURRENT builds on 13.x.
    
    MFC after:      3 days
    MFC with:       c511a5ab53ba335dc85f7ac93843872eb5763602
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 release/release.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/release/release.sh b/release/release.sh
index 4020c27feaa0..58f946b9bba1 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -308,7 +308,13 @@ extra_chroot_setup() {
 			GITUNSETOPTS="${GITUNSETOPTS} ICONV NLS P4 PERL"
 			GITUNSETOPTS="${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN"
 			GITUNSETOPTS="${GITUNSETOPTS} PCRE PCRE2"
+			PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
+			PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
+			PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
+			PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports"
+			PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
 			eval chroot ${CHROOTDIR} env OPTIONS_UNSET=\"${GITUNSETOPTS}\" \
+				${PBUILD_FLAGS} \
 				make -C /usr/ports/devel/git FORCE_PKG_REGISTER=1 \
 				WRKDIRPREFIX=/tmp/ports \
 				DISTDIR=/tmp/distfiles \
@@ -345,6 +351,7 @@ extra_chroot_setup() {
 		_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
 		REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
 		BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+		UNAME_r=${REVISION}-${BRANCH}
 		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
 		PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
 		PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"