Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Sep 2011 02:27:04 +0000 (UTC)
From:      Ken Smith <kensmith@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r225757 - in head: . gnu/usr.bin/groff/tmac release share/examples/cvsup sys/conf sys/sys usr.sbin/pkg_install/add
Message-ID:  <201109260227.p8Q2R4WI051793@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kensmith
Date: Mon Sep 26 02:27:04 2011
New Revision: 225757
URL: http://svn.freebsd.org/changeset/base/225757

Log:
  Shift head from 9.0-CURRENT to 10.0-CURRENT in preparation for releasing
  it from the 9.0-RELEASE release cycle code freeze.
  
  Approved by:	re (implicit)

Modified:
  head/UPDATING
  head/gnu/usr.bin/groff/tmac/mdoc.local
  head/release/Makefile.sysinstall
  head/share/examples/cvsup/stable-supfile
  head/sys/conf/newvers.sh
  head/sys/sys/param.h
  head/usr.sbin/pkg_install/add/main.c

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Sep 25 15:28:09 2011	(r225756)
+++ head/UPDATING	Mon Sep 26 02:27:04 2011	(r225757)
@@ -9,8 +9,8 @@ handbook.
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW:
-	FreeBSD 9.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
+	FreeBSD 10.x has many debugging features turned on, in both the kernel
 	and userland.  These features attempt to detect incorrect use of
 	system primitives, and encourage loud failure through extra sanity
 	checking and fail stop semantics.  They also substantially impact
@@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20110923:
+	The stable/9 branch created in subversion.  This corresponds to the
+	RELENG_9 branch in CVS.
+
 20110913:
 	This commit modifies vfs_register() so that it uses a hash
 	calculation to set vfc_typenum, which is enabled by default.

Modified: head/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- head/gnu/usr.bin/groff/tmac/mdoc.local	Sun Sep 25 15:28:09 2011	(r225756)
+++ head/gnu/usr.bin/groff/tmac/mdoc.local	Mon Sep 26 02:27:04 2011	(r225757)
@@ -71,12 +71,13 @@
 .ds doc-volume-as-arm      arm
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~9.0
+.ds doc-default-operating-system FreeBSD\~10.0
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.4    7.4
 .ds doc-operating-system-FreeBSD-8.3    8.3
 .ds doc-operating-system-FreeBSD-9.0    9.0
+.ds doc-operating-system-FreeBSD-10.0   10.0
 .
 .\" Definitions not (yet) in doc-syms
 .

Modified: head/release/Makefile.sysinstall
==============================================================================
--- head/release/Makefile.sysinstall	Sun Sep 25 15:28:09 2011	(r225756)
+++ head/release/Makefile.sysinstall	Mon Sep 26 02:27:04 2011	(r225757)
@@ -24,16 +24,16 @@
 # Set these, release builder!
 #
 # Fixed version:
-#BUILDNAME=9.0-CURRENT
+#BUILDNAME=10.0-CURRENT
 #
 # Automatic SNAP versioning:
 DATE != date +%Y%m%d
-BASE = 9.0
+BASE = 10.0
 BUILDNAME?=${BASE}-${DATE}-SNAP
 #
 #CHROOTDIR=/junk/release
 # If this is a -stable snapshot, then set
-#RELEASETAG=RELENG_8
+#RELEASETAG=RELENG_9
 #
 # To test a release with a source tree containing patches and
 # other work. This tree will get copied instead of getting the
@@ -72,7 +72,7 @@ BUILDNAME?=${BASE}-${DATE}-SNAP
 #
 # Subversion branch to build for src.  If this is not set then it is
 # automatically computed from RELEASETAG.
-#SVNBRANCH=stable/8
+#SVNBRANCH=stable/9
 #
 # Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we
 # are building an official release.  Otherwise, we are building for

Modified: head/share/examples/cvsup/stable-supfile
==============================================================================
--- head/share/examples/cvsup/stable-supfile	Sun Sep 25 15:28:09 2011	(r225756)
+++ head/share/examples/cvsup/stable-supfile	Mon Sep 26 02:27:04 2011	(r225757)
@@ -66,11 +66,11 @@
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/var/db
 *default prefix=/usr
-# The following line is for 8-stable.  If you want 7-stable, 6-stable,
-# 5-stable, 4-stable, 3-stable, or 2.2-stable, change to "RELENG_7",
-# "RELENG_6", "RELENG_5", "RELENG_4", "RELENG_3", or "RELENG_2_2"
-# respectively.
-*default release=cvs tag=RELENG_8
+# The following line is for 9-stable.  If you want 8-stable, 7-stable,
+# 6-stable, 5-stable, 4-stable, 3-stable, or 2.2-stable, change to
+# "RELENG_7", "RELENG_6", "RELENG_5", "RELENG_4", "RELENG_3", or
+# "RELENG_2_2" respectively.
+*default release=cvs tag=RELENG_9
 *default delete use-rel-suffix
 
 # If you seem to be limited by CPU rather than network or disk bandwidth, try

Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh	Sun Sep 25 15:28:09 2011	(r225756)
+++ head/sys/conf/newvers.sh	Mon Sep 26 02:27:04 2011	(r225757)
@@ -31,8 +31,8 @@
 # $FreeBSD$
 
 TYPE="FreeBSD"
-REVISION="9.0"
-BRANCH="BETA2"
+REVISION="10.0"
+BRANCH="CURRENT"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Sun Sep 25 15:28:09 2011	(r225756)
+++ head/sys/sys/param.h	Mon Sep 26 02:27:04 2011	(r225757)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 900044	/* Master, propagated to newvers */
+#define __FreeBSD_version 1000000	/* Master, propagated to newvers */
 
 #ifdef _KERNEL
 #define	P_OSREL_SIGSEGV		700004

Modified: head/usr.sbin/pkg_install/add/main.c
==============================================================================
--- head/usr.sbin/pkg_install/add/main.c	Sun Sep 25 15:28:09 2011	(r225756)
+++ head/usr.sbin/pkg_install/add/main.c	Mon Sep 26 02:27:04 2011	(r225757)
@@ -87,6 +87,7 @@ struct {
 	{ 800000, 800499, "/packages-8.0-release" },
 	{ 801000, 801499, "/packages-8.1-release" },
 	{ 802000, 802499, "/packages-8.2-release" },
+	{ 900000, 900499, "/packages-9.0-release" },
 	{ 300000, 399000, "/packages-3-stable" },
 	{ 400000, 499000, "/packages-4-stable" },
 	{ 502100, 502128, "/packages-5-current" },
@@ -94,7 +95,8 @@ struct {
 	{ 600100, 699000, "/packages-6-stable" },
 	{ 700100, 799000, "/packages-7-stable" },
 	{ 800500, 899000, "/packages-8-stable" },
-	{ 900000, 999000, "/packages-9-current" },
+	{ 900500, 999000, "/packages-9-stable" },
+	{ 1000000, 1099000, "/packages-10-current" },
 	{ 0, 9999999, "/packages-current" },
 	{ 0, 0, NULL }
 };



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109260227.p8Q2R4WI051793>