From 6cc6bc54dceaf1129fdc2784f378f47b9208de5d Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Sun, 24 Aug 2014 12:50:50 +0000
Subject: Set OSREL and UNAME_r in release/release.sh when building ports to
 prevent ports build failures from killing the release build.

MFC after:	3 days
X-MFC-with:	r270417, r270418
Sponsored by:	The FreeBSD Foundation
---
 release/release.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'release/release.sh')

diff --git a/release/release.sh b/release/release.sh
index 9d345a0..858c7c8 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -255,9 +255,13 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then
 
 	## Trick the ports 'run-autotools-fixup' target to do the right thing.
 	_OSVERSION=$(sysctl -n kern.osreldate)
+	REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+	BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+	UNAME_r=${REVISION}-${BRANCH}
 	if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
 		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
-		PBUILD_FLAGS="${PBUILD_FLAGS}"
+		PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
+		PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
 		chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
 			${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
 	fi
-- 
cgit v1.1