The branch releng/14.2 has been updated by cperciva:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c8918d6c7412fce87922e9bd7e4f5c7d7ca96eb7
commit c8918d6c7412fce87922e9bd7e4f5c7d7ca96eb7
Author: Colin Percival <cperc...@freebsd.org>
AuthorDate: 2024-11-29 00:00:00 +0000
Commit: Colin Percival <cperc...@freebsd.org>
CommitDate: 2024-11-29 00:00:00 +0000
Update in preparation for 14.2-RELEASE
- Bump BRANCH to RELEASE
- Add the anticipated RELEASE announcement date
- Set a static __FreeBSD_version
Approved by: re (implicit)
Sponsored by: Amazon
---
UPDATING | 3 +++
lib/csu/common/crtbrand.S | 2 +-
sys/conf/newvers.sh | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/UPDATING b/UPDATING
index e8ce65692e6b..3a644b8feaf2 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.
+20241203:
+ 14.2-RELEASE.
+
20240419:
Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have
been upgraded to 18.1.6. It is important that you run `make delete-old`
diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S
index b59e2fd8056b..7d14d0c1df65 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 1402000
4:
.section .note.GNU-stack,"",%progbits
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index af5875c5c0b3..8afaa8ccd571 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.2"
-BRANCH="RC1"
+BRANCH="RELEASE"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
