From cc807f9e55c25fe811f7db5d1540455ff2bf8716 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Fri, 1 Nov 2019 00:00:17 +0000 Subject: [PATCH] - Switch releng/12.1 from RC2 to RELEASE. - Add the anticipated 12.1-RELEASE date to UPDATING. - Set a static __FreeBSD_version. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (Netgate) --- 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 f99632dc8d6..003bc1514b3 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. +20191104: + 12.1-RELEASE. + 20190914: The vfs.fusefs.sync_unmount and vfs.fusefs.init_backgrounded sysctls and the "-o sync_unmount" and "-o init_backgrounded" mount options have diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c index c407de435b9..e11941ef5d4 100644 --- a/lib/csu/common/crtbrand.c +++ b/lib/csu/common/crtbrand.c @@ -65,5 +65,5 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = __FreeBSD_version + .desc = 1201000 }; diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index bac5c4ed731..d94f4161d1f 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.1" -BRANCH="RC2" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi -- 2.45.0