From 5be2c881841ee72177c964557b3bcf82d26011ff Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 4 Apr 2014 07:34:46 +0000
Subject: MFC r262810, r262862, r264105: r262810:   Merge enabling building
 FreeBSD/arm images as part of the   release build process.

r262862:
  Provide backwards-compatibility with release.conf SVNROOT
  entries that do not have a trailing '/'.

r264105:
  Add ZEDBOARD support for release builds.

* Local modifications:
  - Set SRCBRANCH from head/ to stable/10/.
  - Strip svn:merginfo from ^/projects/release-embedded to avoid
    pollution.

Sponsored by:	The FreeBSD Foundation
---
 release/release.conf.sample | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'release/release.conf.sample')

diff --git a/release/release.conf.sample b/release/release.conf.sample
index f9992c4..99e7c2f 100644
--- a/release/release.conf.sample
+++ b/release/release.conf.sample
@@ -10,7 +10,7 @@ CHROOTDIR="/scratch"
 SVNROOT="svn://svn.FreeBSD.org/"
 
 ## Set the src/, ports/, and doc/ branches or tags.
-SRCBRANCH="base/head@rHEAD"
+SRCBRANCH="base/stable/10@rHEAD"
 DOCBRANCH="doc/head@rHEAD"
 PORTBRANCH="ports/head@rHEAD"
 
@@ -45,5 +45,17 @@ PORTBRANCH="ports/head@rHEAD"
 ## Set miscellaneous 'make release' settings.
 #NODOC=
 #NOPORTS=
-#RELSTRING=
 #WITH_DVD=
+
+## Set when building embedded images.
+#EMBEDDEDBUILD=
+
+## Set to skip the chroot environment buildworld/installworld/distribution
+## step if it is expected the build environment will exist via alternate
+## means.
+#CHROOTBUILD_SKIP=
+
+## Set to pass additional flags to make(1) for the build chroot setup, such
+## as TARGET/TARGET_ARCH.
+#CHROOT_MAKEENV=
+
-- 
cgit v1.1