svn commit: r335510 - in releng/11.2: . lib/csu/common sys/conf

[Glen Barber]

Author: gjb
Date: Thu Jun 21 22:59:49 2018
New Revision: 335510
URL: https://svnweb.freebsd.org/changeset/base/335510

Log:
  - Switch releng/11.2 to -RELEASE.
  - Add the anticipated 11.2-RELEASE date to UPDATING.
  - Set a static __FreeBSD_version.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

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

Modified: releng/11.2/UPDATING
==============================================================================
--- releng/11.2/UPDATING	Thu Jun 21 21:50:00 2018	(r335509)
+++ releng/11.2/UPDATING	Thu Jun 21 22:59:49 2018	(r335510)
@@ -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.
 
+20180627:
+	11.2-RELEASE.
+
 20180504:
 	The tz database (tzdb) has been updated to 2018e.  This version more
 	correctly models time stamps in time zones with negative DST such as

Modified: releng/11.2/lib/csu/common/crtbrand.c
==============================================================================
--- releng/11.2/lib/csu/common/crtbrand.c	Thu Jun 21 21:50:00 2018	(r335509)
+++ releng/11.2/lib/csu/common/crtbrand.c	Thu Jun 21 22:59:49 2018	(r335510)
@@ -62,5 +62,5 @@ static const struct {
 	.descsz = sizeof(int32_t),
 	.type = ABI_NOTETYPE,
 	.name = NOTE_FREEBSD_VENDOR,
-	.desc = __FreeBSD_version
+	.desc = 1102000
 };

Modified: releng/11.2/sys/conf/newvers.sh
==============================================================================
--- releng/11.2/sys/conf/newvers.sh	Thu Jun 21 21:50:00 2018	(r335509)
+++ releng/11.2/sys/conf/newvers.sh	Thu Jun 21 22:59:49 2018	(r335510)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="RC3"
+BRANCH="RELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi