diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2019-11-01 00:00:17 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2019-11-01 00:00:17 +0000 |
| commit | cc807f9e55c25fe811f7db5d1540455ff2bf8716 (patch) | |
| tree | aad60a8a5c69442e5f87747738fd9ca9e29e0ada | |
| parent | 16981b16f338577fa04c1eac9b41f5b53a5a5c63 (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
@@ -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 c407de435b96..e11941ef5d4e 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 bac5c4ed731d..d94f4161d1f7 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 |