svn commit: r304015 - releng/11.0/release

[Glen Barber]

Author: gjb
Date: Fri Aug 12 19:26:12 2016
New Revision: 304015
URL: https://svnweb.freebsd.org/changeset/base/304015

Log:
  MFs11 r304014:
  MFC r303897:
    Pass overrides to make(1) when building ports for arm/armv6
    targets, similar to what is done for the run-autotools-fixup
    override for non-arm targets.
  
    While here, set SRCBRANCH in release.conf.sample to use
    releng/11.0, which is a direct commit to releng/11.0.
  
  Approved by:	re (kib)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/11.0/release/release.conf.sample
  releng/11.0/release/release.sh
Directory Properties:
  releng/11.0/   (props changed)

Modified: releng/11.0/release/release.conf.sample
==============================================================================
--- releng/11.0/release/release.conf.sample	Fri Aug 12 19:06:29 2016	(r304014)
+++ releng/11.0/release/release.conf.sample	Fri Aug 12 19:26:12 2016	(r304015)
@@ -16,7 +16,7 @@ CHROOTDIR="/scratch"
 SVNROOT="svn://svn.FreeBSD.org/"
 
 ## Set the src/, ports/, and doc/ branches or tags.
-SRCBRANCH="base/stable/11 at rHEAD"
+SRCBRANCH="base/releng/11.0 at rHEAD"
 DOCBRANCH="doc/head at rHEAD"
 PORTBRANCH="ports/head at rHEAD"
 

Modified: releng/11.0/release/release.sh
==============================================================================
--- releng/11.0/release/release.sh	Fri Aug 12 19:06:29 2016	(r304014)
+++ releng/11.0/release/release.sh	Fri Aug 12 19:26:12 2016	(r304015)
@@ -287,9 +287,15 @@ extra_chroot_setup() {
 	fi
 
 	if [ ! -z "${EMBEDDEDPORTS}" ]; then
+		_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)
+		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
+		PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
+		PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
 		for _PORT in ${EMBEDDEDPORTS}; do
 			eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
-				BATCH=1 FORCE_PKG_REGISTER=1 install clean distclean
+				FORCE_PKG_REGISTER=1 ${PBUILD_FLAGS} install clean distclean
 		done
 	fi