svn commit: r285830 - in releng/10.2: . etc/pkg sys/conf sys/sys

[Glen Barber]

Author: gjb
Date: Thu Jul 23 23:31:40 2015
New Revision: 285830
URL: https://svnweb.freebsd.org/changeset/base/285830

Log:
  - Copy stable/10 at 285827 to releng/10.2 in preparation for 10.2-RC1
    builds.
  - Update newvers.sh to reflect RC1.
  - Update __FreeBSD_version to reflect 10.2.
  - Update default pkg(8) configuration to use the quarterly branch.[1]
  
  Discussed with:	re, portmgr [1]
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Added:
  releng/10.2/
     - copied from r285827, stable/10/
Modified:
  releng/10.2/etc/pkg/FreeBSD.conf
  releng/10.2/sys/conf/newvers.sh
  releng/10.2/sys/sys/param.h

Modified: releng/10.2/etc/pkg/FreeBSD.conf
==============================================================================
--- stable/10/etc/pkg/FreeBSD.conf	Thu Jul 23 20:01:56 2015	(r285827)
+++ releng/10.2/etc/pkg/FreeBSD.conf	Thu Jul 23 23:31:40 2015	(r285830)
@@ -8,7 +8,7 @@
 #
 
 FreeBSD: {
-  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkg",

Modified: releng/10.2/sys/conf/newvers.sh
==============================================================================
--- stable/10/sys/conf/newvers.sh	Thu Jul 23 20:01:56 2015	(r285827)
+++ releng/10.2/sys/conf/newvers.sh	Thu Jul 23 23:31:40 2015	(r285830)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.2"
-BRANCH="BETA2"
+BRANCH="RC1"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/10.2/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h	Thu Jul 23 20:01:56 2015	(r285827)
+++ releng/10.2/sys/sys/param.h	Thu Jul 23 23:31:40 2015	(r285830)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1001519	/* Master, propagated to newvers */
+#define __FreeBSD_version 1002000	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,