Skip site navigation (1)Skip section navigation (2)


| raw e-mail | index | archive | help
The branch releng/14.1 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=10e31f0946d820d53adc58b7d013b969e4a9a8ed

commit 10e31f0946d820d53adc58b7d013b969e4a9a8ed
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-05-31 00:31:16 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-05-31 00:31:16 +0000

    Update in preparation for 14.1-RELEASE
    
    - Bump BRANCH to RELEASE
    - Add the anticipated RELEASE announcement date
    - Set a static __FreeBSD_version
    
    Approved by:    re (implicit)
    Sponsored by:   https://www.patreon.com/cperciva
---
 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 83b0d8b27cda..2d4a66d0d29c 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.
 
+20240604:
+	14.1-RELEASE.
+
 20240202:
 	Loader now also read configuration files listed in local_loader_conf_files.
 	Files listed here are the last ones read. And /boot/loader.conf.local was
diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S
index b59e2fd8056b..65c0c3863bde 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		1401000
 4:
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 7ba6ed47b3b8..38d445be32a6 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
 
 TYPE="FreeBSD"
 REVISION="14.1"
-BRANCH="RC1"
+BRANCH="RELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?>