aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2023-11-09 23:38:09 +0000
committerGlen Barber <gjb@FreeBSD.org>2023-11-09 23:38:09 +0000
commitf9716eee8ab45ad906d9b5c5233ca20c10226ca7 (patch)
tree472a732e294a42323bfb4516e0d0c737ef0ff162
parentac3db6ea0e968338bbe68c0d89505242b246d66f (diff)
downloadsrc-f9716eee8ab45ad906d9b5c5233ca20c10226ca7.tar.gz
src-f9716eee8ab45ad906d9b5c5233ca20c10226ca7.zip
release: update releng/14.0 to -RELEASErelease/14.0.0
- Add UPDATING entry anticipating the announcement date. - Set a static __FreeBSD_version in crtbrand.S. - Update BRANCH to reflect RELEASE. Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd
-rw-r--r--UPDATING3
-rw-r--r--lib/csu/common/crtbrand.S2
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 5 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index 58eeafa44bba..c32c3b7ec940 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,9 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20231114:
+ FreeBSD 14.0-RELEASE.
+
20231108:
14.0-RC4-p1 SA-23:15.stdio
SA-23:16.cap_net
diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S
index 0ed86bfba2b2..9ed2d10f5210 100644
--- a/lib/csu/common/crtbrand.S
+++ b/lib/csu/common/crtbrand.S
@@ -43,7 +43,7 @@
.4byte NT_FREEBSD_ABI_TAG
1: .asciz NOTE_FREEBSD_VENDOR
2: .p2align 2
-3: .4byte __FreeBSD_version
+3: .4byte 1400097
4:
.section .note.GNU-stack,"",%progbits
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index b40c56ae759c..a2b89f3caca7 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.0"
-BRANCH="RC4-p1"
+BRANCH="RELEASE"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi