svn commit: r321309 - in releng/11.1: . lib/csu/common sys/conf

[Glen Barber]

Author: gjb
Date: Thu Jul 20 23:39:50 2017
New Revision: 321309
URL: https://svnweb.freebsd.org/changeset/base/321309

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

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

Modified: releng/11.1/UPDATING
==============================================================================
--- releng/11.1/UPDATING	Thu Jul 20 23:15:50 2017	(r321308)
+++ releng/11.1/UPDATING	Thu Jul 20 23:39:50 2017	(r321309)
@@ -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.
 
+20170725:
+	11.1-RELEASE.
+
 20170518:
 	arm64 builds now use the base system LLD 4.0.0 linker by default,
 	instead of requiring that the aarch64-binutils port or package be

Modified: releng/11.1/lib/csu/common/crtbrand.c
==============================================================================
--- releng/11.1/lib/csu/common/crtbrand.c	Thu Jul 20 23:15:50 2017	(r321308)
+++ releng/11.1/lib/csu/common/crtbrand.c	Thu Jul 20 23:39:50 2017	(r321309)
@@ -62,5 +62,5 @@ static const struct {
 	.descsz = sizeof(int32_t),
 	.type = ABI_NOTETYPE,
 	.name = NOTE_FREEBSD_VENDOR,
-	.desc = __FreeBSD_version
+	.desc = 1101001
 };

Modified: releng/11.1/sys/conf/newvers.sh
==============================================================================
--- releng/11.1/sys/conf/newvers.sh	Thu Jul 20 23:15:50 2017	(r321308)
+++ releng/11.1/sys/conf/newvers.sh	Thu Jul 20 23:39:50 2017	(r321309)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.1"
-BRANCH="RC3"
+BRANCH="RELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi