From 62a489e1688b21b7cbdab9ffdb449a67bacc770c Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 21 Jun 2018 22:59:49 +0000 Subject: [PATCH] - 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 --- UPDATING | 3 +++ lib/csu/common/crtbrand.c | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 2410956a1b3..621a5bd71e1 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 04df686ba73..fc7e1ec789c 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 f11b7463fda..f4268a9fd76 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 -- 2.45.0