aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2022-05-11 23:59:24 +0000
committerGlen Barber <gjb@FreeBSD.org>2022-05-11 23:59:24 +0000
commitfc952ac2212b121aa6eefc273f5960ec3e0a466d (patch)
treea85029a219d7a086126b0db4535f5878516368e9
parent9470a2f7da488f3c14051e39691fbfddcf2aa0fe (diff)
downloadsrc-fc952ac2212b121aa6eefc273f5960ec3e0a466d.tar.gz
src-fc952ac2212b121aa6eefc273f5960ec3e0a466d.zip
Update in preparation of 13.1-RELEASEupstream/13.1.0release/13.1.0
- Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC ("Netgate")
-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 2f187e2b2913..cf87aedb8121 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.
+20220516:
+ 13.1-RELEASE.
+
20220123:
For 64-bit architectures the base system is now built with Position
Independent Executable (PIE) support enabled by default. It may be
diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S
index bf223d84bc12..8a4bfdc154bf 100644
--- a/lib/csu/common/crtbrand.S
+++ b/lib/csu/common/crtbrand.S
@@ -45,5 +45,5 @@ __FBSDID("$FreeBSD$");
.4byte NT_FREEBSD_ABI_TAG
1: .asciz NOTE_FREEBSD_VENDOR
2: .p2align 2
-3: .4byte __FreeBSD_version
+3: .4byte 1301000
4:
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index e2f2bcdd6e55..c594724d814f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -54,7 +54,7 @@
TYPE="FreeBSD"
REVISION="13.1"
-BRANCH="RC6"
+BRANCH="RELEASE"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi