svn commit: r270688 - in stable/10/release: . arm

[Glen Barber]

Author: gjb
Date: Wed Aug 27 00:50:51 2014
New Revision: 270688
URL: http://svnweb.freebsd.org/changeset/base/270688

Log:
  MFC r270417, r270418, r270455, r270457:
  
  r270417:
    Fix arm build breakage when building stable/10 on
    head/.
  
  r270418:
    Also export UNAME_r to fix arm builds.
  
  r270455:
    Set OSREL and UNAME_r in release/release.sh when building
    ports to prevent ports build failures from killing the
    release build.
  
  r270457:
    Wrap a long line.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/arm/release.sh
  stable/10/release/release.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/arm/release.sh
==============================================================================
--- stable/10/release/arm/release.sh	Wed Aug 27 00:48:09 2014	(r270687)
+++ stable/10/release/arm/release.sh	Wed Aug 27 00:50:51 2014	(r270688)
@@ -92,6 +92,14 @@ install_uboot() {
 }
 
 main() {
+	# Fix broken ports that use kern.osreldate.
+	OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
+	export OSVERSION
+	REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+	BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+	UNAME_r=${REVISION}-${BRANCH}
+	export UNAME_r
+
 	# Build the 'xdev' target for crochet.
 	eval chroot ${CHROOTDIR} make -C /usr/src \
 		${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \

Modified: stable/10/release/release.sh
==============================================================================
--- stable/10/release/release.sh	Wed Aug 27 00:48:09 2014	(r270687)
+++ stable/10/release/release.sh	Wed Aug 27 00:50:51 2014	(r270688)
@@ -253,11 +253,16 @@ 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
+			${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
+			install clean distclean
 	fi
 fi