Make stable/15 a stable branch

* Turn off LLVM assertions
* Turn on production malloc and reproductible builds
* Set dumpdev="NO" in /etc/defaults/rc.conf
* Remove witness sysctl setting from install images
* Adjust branch to stable/15 in release.conf.sample
* Bump __FreeBSD_version
* Update UPDATING

Adjustments to kernel configurations will come in later commits.

Approved by:	re (implicit)
Sponsored by:	https://www.patreon.com/cperciva
This commit is contained in:
Colin Percival committed 2025-09-04 17:06:39 -07:00
1 parent 3aa0a0aaa2
commit 6e7cc49f94
7 files changed
+15 -30

No files matched your search

+3 -15
View File
@@ -1,4 +1,4 @@
Updating Information for users of FreeBSD-CURRENT.
Updating Information for users of FreeBSD stable/15.
This file is maintained and copyrighted by M. Warner Losh <[email protected]>.
See end of file for further details. For commonly done items, please see the
@@ -12,20 +12,8 @@ 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.
NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
FreeBSD 15.x has many debugging features turned on, in both the kernel
and userland. These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity
checking and fail stop semantics. They also substantially impact
system performance. If you want to do performance measurement,
benchmarking, and optimization, you'll want to turn them off. This
includes various WITNESS- related kernel options, INVARIANTS, malloc
debugging flags in userland, and various verbose features in the
kernel. Many developers choose to disable these features on build
machines to maximize performance. (To completely disable malloc
debugging, define WITH_MALLOC_PRODUCTION in /etc/src.conf and rebuild
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
20250905:
__FreeBSD_version 1500064 after branching stable/15 from main.
20250903:
The BLOAT_KERNEL_WITH_EXTERR kernel config option has been renamed to
+1 -1
View File
@@ -648,7 +648,7 @@ lpd_flags="" # Flags to lpd (if enabled).
nscd_enable="NO" # Run the nsswitch caching daemon.
chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd.
chkprintcap_flags="-d" # Create missing directories by default.
dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO);
dumpdev="NO" # Device to crashdump to (device name, AUTO, or NO);
# this should be commented out here
# for stable branches to respect kenv.
dumpon_flags="" # Options to pass to dumpon(8), followed by dumpdev.
-3
View File
@@ -244,7 +244,6 @@ disc1: ${PKGBASE_REPO}
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf
@@ -285,7 +284,6 @@ bootonly:
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf
@@ -341,7 +339,6 @@ dvd: ${PKGBASE_REPO}
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf
+1 -1
View File
@@ -18,7 +18,7 @@ GITSRC="src.git"
GITPORTS="ports.git"
## Set the src/, ports/, and doc/ branches or tags.
SRCBRANCH="main"
SRCBRANCH="stable/15"
PORTBRANCH="main"
## Sample configuration for using git from ports.
+6 -6
View File
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.Dd August 20, 2025
.Dd September 4, 2025
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -935,8 +935,8 @@ amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64 and powerpc/powerpc64le
Do not build the LLD linker during the bootstrap phase of
the build.
To be able to build the system an alternate linker must be provided via XLD.
.It Va WITHOUT_LLVM_ASSERTIONS
Disable debugging assertions in LLVM.
.It Va WITH_LLVM_ASSERTIONS
Enable debugging assertions in LLVM.
.It Va WITHOUT_LLVM_BINUTILS
Install ELF Tool Chain's binary utilities instead of LLVM's.
This includes
@@ -1190,15 +1190,15 @@ if executed as an unprivileged user.
See
.Xr tests 7
for more details.
.It Va WITH_MALLOC_PRODUCTION
Disable assertions and statistics gathering in
.It Va WITHOUT_MALLOC_PRODUCTION
Enable assertions and statistics gathering in
.Xr malloc 3 .
The run-time options
.Dv opt.abort ,
.Dv opt.abort_conf ,
and
.Dv opt.junk
also default to false.
also default to true.
.It Va WITHOUT_MAN
Do not build manual pages.
When set, these options are also in effect:
+3 -3
View File
@@ -123,7 +123,6 @@ __DEFAULT_YES_OPTIONS = \
LEGACY_CONSOLE \
LLD \
LLD_BOOTSTRAP \
LLVM_ASSERTIONS \
LLVM_BINUTILS \
LLVM_COV \
LLVM_CXXFILT \
@@ -143,6 +142,7 @@ __DEFAULT_YES_OPTIONS = \
MAIL \
MAILWRAPPER \
MAKE \
MALLOC_PRODUCTION \
MITKRB5 \
MLX5TOOL \
NETCAT \
@@ -164,6 +164,7 @@ __DEFAULT_YES_OPTIONS = \
QUOTAS \
RADIUS_SUPPORT \
RBOOTD \
REPRODUCIBLE_BUILD \
RESCUE \
ROUTED \
SENDMAIL \
@@ -210,11 +211,10 @@ __DEFAULT_NO_OPTIONS = \
HESIOD \
LOADER_VERBOSE \
LOADER_VERIEXEC_PASS_MANIFEST \
LLVM_ASSERTIONS \
LLVM_FULL_DEBUGINFO \
MALLOC_PRODUCTION \
OFED_EXTRA \
OPENLDAP \
REPRODUCIBLE_BUILD \
RPCBIND_WARMSTART_SUPPORT \
SORT_THREADS \
ZONEINFO_LEAPSECONDS_SUPPORT \
+1 -1
View File
@@ -74,7 +74,7 @@
* cannot include sys/param.h and should only be updated here.
*/
#undef __FreeBSD_version
#define __FreeBSD_version 1500063
#define __FreeBSD_version 1500064
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,