From 1d21fe9cea3f530b4cfca495632d5a1595a32270 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Fri, 23 Oct 2020 00:00:52 +0000 Subject: [PATCH] - Switch releng/12.2 from RC3 to RELEASE. - Add the anticipated 12.2-RELEASE date to UPDATING. Fix a missing colon in the previous UPDATING entry while here. - Set a static __FreeBSD_version. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) --- UPDATING | 5 ++++- lib/csu/common/crtbrand.c | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/UPDATING b/UPDATING index d545d40d29a..c8087540fe0 100644 --- a/UPDATING +++ b/UPDATING @@ -16,7 +16,10 @@ 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. -20200915 p1 FreeBSD-SA-20:27.ure +20201027: + 12.2-RELEASE. + +20200915: p1 FreeBSD-SA-20:27.ure FreeBSD-SA-20:28.bhyve_vmcs FreeBSD-SA-20:29.bhyve_svm FreeBSD-SA-20:30.ftpd diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c index f8fb0024db2..969f4dd3963 100644 --- a/lib/csu/common/crtbrand.c +++ b/lib/csu/common/crtbrand.c @@ -65,7 +65,7 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = __FreeBSD_version + .desc = 1202000 }; static const struct { diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 7b33e11934a..4415230630d 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.2" -BRANCH="RC3" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi -- 2.45.0