summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2025-11-28 00:00:00 +0000
committerColin Percival <cperciva@FreeBSD.org>2025-11-28 00:00:00 +0000
commit7aedc8de6446ad5a10d553b926423c689f0a3363 (patch)
treea3530bdc29fd2abc77a3f4480d322b135f36fd93
parent463cec10a5fba0b42db7bf699b21e569f2fd6459 (diff)
Update in preparation for 15.0-RELEASErelease/15.0.0
- Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit)
-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 0db786a70646..c23c9a66cbaa 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.
+20251202:
+ 15.0-RELEASE.
+
20251126:
15.0-RC4-p1 SA-25:10.unbound
diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S
index a06f72daa99d..f62736c52301 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 1500068
4:
.section .note.GNU-stack,"",%progbits
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 9d9a75a22c25..e48cfd747602 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -51,7 +51,7 @@
TYPE="FreeBSD"
REVISION="15.0"
-BRANCH="RC4-p1"
+BRANCH="RELEASE"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi