svn commit: r365619 - in stable/12/sys: conf sys

[Glen Barber]

Author: gjb
Date: Fri Sep 11 00:04:23 2020
New Revision: 365619
URL: https://svnweb.freebsd.org/changeset/base/365619

Log:
  Rename stable/12 to -STABLE, and bump __FreeBSD_version after
  releng/12.2 had been created.
  
  Approved by:	re (implicit)
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  stable/12/sys/conf/newvers.sh
  stable/12/sys/sys/param.h

Modified: stable/12/sys/conf/newvers.sh
==============================================================================
--- stable/12/sys/conf/newvers.sh	Thu Sep 10 23:56:59 2020	(r365618)
+++ stable/12/sys/conf/newvers.sh	Fri Sep 11 00:04:23 2020	(r365619)
@@ -49,7 +49,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.2"
-BRANCH=${BRANCH_OVERRIDE:-PRERELEASE}
+BRANCH=${BRANCH_OVERRIDE:-STABLE}
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
 

Modified: stable/12/sys/sys/param.h
==============================================================================
--- stable/12/sys/sys/param.h	Thu Sep 10 23:56:59 2020	(r365618)
+++ stable/12/sys/sys/param.h	Fri Sep 11 00:04:23 2020	(r365619)
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1201526	/* Master, propagated to newvers */
+#define __FreeBSD_version 1202500	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,