Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Mar 2013 20:35:38 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org
Subject:   svn commit: r248850 - in releng/8.4: . release share/examples/cvsup sys/sys
Message-ID:  <201303282035.r2SKZcIt091281@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Thu Mar 28 20:35:37 2013
New Revision: 248850
URL: http://svnweb.freebsd.org/changeset/base/248850

Log:
  Version bumps after releng/8.4 branch:
  
  Makefile:
   * Update the CVS branch tag.
  
  release/Makefile:
   * Update RELEASETAG and SVNBRANCH.
  
  share/examples/cvsup/standard-supfile:
   * Update to have "make update" pull from RELENG_8_4.
  
  sys/sys/param.h:
   * Update __FreeBSD_version to 804000 to reflect releng/8.4 has been
     branched.
  
  Approved by:	re (rodrigc)

Modified:
  releng/8.4/Makefile.inc1
  releng/8.4/release/Makefile
  releng/8.4/share/examples/cvsup/standard-supfile
  releng/8.4/sys/sys/param.h

Modified: releng/8.4/Makefile.inc1
==============================================================================
--- releng/8.4/Makefile.inc1	Thu Mar 28 20:33:07 2013	(r248849)
+++ releng/8.4/Makefile.inc1	Thu Mar 28 20:35:37 2013	(r248850)
@@ -92,7 +92,7 @@ CLEANDIR=	cleandir
 .endif
 
 CVS?=		cvs
-CVSFLAGS?=	-r RELENG_8 -P -d -I!
+CVSFLAGS?=	-r RELENG_8_4 -P -d -I!
 SVN?=		svn
 SVNFLAGS?=	-r HEAD
 SUP?=		/usr/bin/csup

Modified: releng/8.4/release/Makefile
==============================================================================
--- releng/8.4/release/Makefile	Thu Mar 28 20:33:07 2013	(r248849)
+++ releng/8.4/release/Makefile	Thu Mar 28 20:35:37 2013	(r248850)
@@ -33,7 +33,7 @@ BUILDNAME?=${BASE}-${DATE}-SNAP
 #
 #CHROOTDIR=/junk/release
 # If this is a -stable snapshot, then set
-#RELEASETAG=RELENG_8
+#RELEASETAG=RELENG_8_4
 #
 # 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=releng/8.4
 #
 # Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we
 # are building an official release.  Otherwise, we are building for

Modified: releng/8.4/share/examples/cvsup/standard-supfile
==============================================================================
--- releng/8.4/share/examples/cvsup/standard-supfile	Thu Mar 28 20:33:07 2013	(r248849)
+++ releng/8.4/share/examples/cvsup/standard-supfile	Thu Mar 28 20:35:37 2013	(r248850)
@@ -46,7 +46,7 @@
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/var/db
 *default prefix=/usr
-*default release=cvs tag=RELENG_8
+*default release=cvs tag=RELENG_8_4
 *default delete use-rel-suffix
 
 # If you seem to be limited by CPU rather than network or disk bandwidth, try

Modified: releng/8.4/sys/sys/param.h
==============================================================================
--- releng/8.4/sys/sys/param.h	Thu Mar 28 20:33:07 2013	(r248849)
+++ releng/8.4/sys/sys/param.h	Thu Mar 28 20:35:37 2013	(r248850)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 803501	/* Master, propagated to newvers */
+#define __FreeBSD_version 804000	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,



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