aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2018-06-21 22:59:49 +0000
committerGlen Barber <gjb@FreeBSD.org>2018-06-21 22:59:49 +0000
commit617bf97c016b3bd3305cd606897ead7dcc7634a1 (patch)
tree1ef2cf6f2d90b136f3ddbc055e37517ab57b8a24
parent071c535fa28c11da5c0874995fdf3de15f4aae3f (diff)
downloadsrc-release/11.2.0.tar.gz
src-release/11.2.0.zip
- Switch releng/11.2 to -RELEASE.release/11.2.0
- Add the anticipated 11.2-RELEASE date to UPDATING. - Set a static __FreeBSD_version. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
-rw-r--r--UPDATING3
-rw-r--r--lib/csu/common/crtbrand.c2
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 5 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index 2410956a1b33..621a5bd71e17 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
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
diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c
index 04df686ba731..fc7e1ec789c6 100644
--- a/lib/csu/common/crtbrand.c
+++ b/lib/csu/common/crtbrand.c
@@ -62,5 +62,5 @@ static const struct {
.descsz = sizeof(int32_t),
.type = ABI_NOTETYPE,
.name = NOTE_FREEBSD_VENDOR,
- .desc = __FreeBSD_version
+ .desc = 1102000
};
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index f11b7463fda1..f4268a9fd762 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.2"
-BRANCH="RC3"
+BRANCH="RELEASE"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi