release: update to -RELEASErelease/12.4.0

 - Switch releng/12.4 from RC2 to RELEASE.
 - Add the anticipated 12.4-RELEASE date to UPDATING.
 - Set a static __FreeBSD_version.

Approved by:	re (implicit)
Sponsored by:	Rubicon Communications, LLC ("Netgate")

3 files changed, 5 insertions, 2 deletions

diff --git a/UPDATING b/UPDATING
index c6745a82d6eb..49888b0fde9c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,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.
 
+20221205:
+	12.4-RELEASE.
+
 20221129:
 	12.4-RC2-p2 FreeBSD-SA-22:15.ping
 		    FreeBSD-EN-22:28.heimdal
diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c
index f8fb0024db24..3651da861971 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 = 1204000
 };
 
 static const struct {
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 54f36bab7778..5c58afc6eac4 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -49,7 +49,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.4"
-BRANCH="RC2-p2"
+BRANCH="RELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi