diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2018-06-21 22:59:49 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2018-06-21 22:59:49 +0000 |
| commit | 617bf97c016b3bd3305cd606897ead7dcc7634a1 (patch) | |
| tree | 1ef2cf6f2d90b136f3ddbc055e37517ab57b8a24 | |
| parent | 071c535fa28c11da5c0874995fdf3de15f4aae3f (diff) | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | lib/csu/common/crtbrand.c | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING index 2410956a1b33b..621a5bd71e177 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 04df686ba731f..fc7e1ec789c64 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 f11b7463fda1a..f4268a9fd7624 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 |