svn commit: r354233 - in releng/12.1: . lib/csu/common sys/conf

[Glen Barber]

Author: gjb
Date: Fri Nov  1 00:00:17 2019
New Revision: 354233
URL: https://svnweb.freebsd.org/changeset/base/354233

Log:
  - Switch releng/12.1 from RC2 to RELEASE.
  - Add the anticipated 12.1-RELEASE date to UPDATING.
  - Set a static __FreeBSD_version.
  
  Approved by:	re (implicit)
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  releng/12.1/UPDATING
  releng/12.1/lib/csu/common/crtbrand.c
  releng/12.1/sys/conf/newvers.sh

Modified: releng/12.1/UPDATING
==============================================================================
--- releng/12.1/UPDATING	Thu Oct 31 22:29:13 2019	(r354232)
+++ releng/12.1/UPDATING	Fri Nov  1 00:00:17 2019	(r354233)
@@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20191104:
+	12.1-RELEASE.
+
 20190914:
 	The vfs.fusefs.sync_unmount and vfs.fusefs.init_backgrounded sysctls
 	and the "-o sync_unmount" and "-o init_backgrounded" mount options have

Modified: releng/12.1/lib/csu/common/crtbrand.c
==============================================================================
--- releng/12.1/lib/csu/common/crtbrand.c	Thu Oct 31 22:29:13 2019	(r354232)
+++ releng/12.1/lib/csu/common/crtbrand.c	Fri Nov  1 00:00:17 2019	(r354233)
@@ -65,5 +65,5 @@ static const struct {
 	.descsz = sizeof(int32_t),
 	.type = NT_FREEBSD_ABI_TAG,
 	.name = NOTE_FREEBSD_VENDOR,
-	.desc = __FreeBSD_version
+	.desc = 1201000
 };

Modified: releng/12.1/sys/conf/newvers.sh
==============================================================================
--- releng/12.1/sys/conf/newvers.sh	Thu Oct 31 22:29:13 2019	(r354232)
+++ releng/12.1/sys/conf/newvers.sh	Fri Nov  1 00:00:17 2019	(r354233)
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="RC2"
+BRANCH="RELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi