From nobody Fri Sep 05 01:24:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cHzC42xgxz66ql7; Fri, 05 Sep 2025 01:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHzC41zPYz3HtL; Fri, 05 Sep 2025 01:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757035440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtVGxU5IXvM3Apz1eANvHIZ5VtgcMRkLmx/TtcX42hc=; b=GCgLBo+P9vN3C/qfP6ek6fRIy1dkkn9L4u/VhRSBbtnVYXpopYv1aGNMy2NvbpDMmLatjK A1Tff6HqEcaVvxqF+6NwRSQCjgRgybZQJ3z58K3hthQ8Vl1J1xyJ7s0VDFDNP8PmaUIrAU BxD2Upq2JNrE9gkkHHeyCWFSpF2ZXYZ73T4lMc0m7qA6T3hZ7G0bZWEw+OuxNtmupOOW+v 6RrFn3sj4D1uFcXXBgDooQoISjQHJ6n7lQYT7ZlJ4QgP+Sj3lbC0trMk2lTUAwBqVGCF/l QfUy0dwerXFqe0xaW7olqQgq4ExfHQewpntOuZjBDQ0IKcI0ffRYk+9N+juCYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757035440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtVGxU5IXvM3Apz1eANvHIZ5VtgcMRkLmx/TtcX42hc=; b=JwDHA4Q0FmFEThU95gclAv6Ejv+9m0BwTba7PTJAAaQi67ailcqKSqbLHJXgovJNejdSf0 LZ46j4bEorNWYcUBdKEkg5gwXyUM2LLehUGxNUek/F8NXEUj5BTNPAb4gNsBm5j/gppd6o mmBo5okjJEC48BNZG37IZMjd1n17ZNOFHugnDhAEfzzSGossXG0Qa0eRDWxXTcYozqTAfH A30SxUPgSyixduKPRdO9zG5bo9Bn+FT36zA896J5RquL4otDr1FBRwlfZCkO6y/JZRH2Lt c7WUv56jGvRZmzmww1ZYIwQq3y39bXYF/HaDbnbCnuwnwD4nueF5iBpIY5jrvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757035440; a=rsa-sha256; cv=none; b=T9j9lF8uqAraBdNeU0Ppt/DHEdQmz7ncWLgx3CE/HrsTVwJTAiFc2uKvFq6DiBIGB+P8eJ MxQWJju3s1y5X05EIRwCewpEp8FFTRHQPmZS+6sbURSWTbN80erjZNKN2wYw0Hs2aLbP/4 GItESsIl0AhKn1/fzx9P5AfAPScN5EuJWgrY7UjNqDZL/gPMX8bwo8lcBB3ROjbu4SqOvZ qRcFLm20vHcJCAuQ58+coBjoYKub3UZ6ExuI1rgs+Y6NjtwR8bx/hZr0V1q36MOjyDVpaO /Q5P5nR7wlp6J1JYcD5CSKfQOjcr8jYBRQe9+TH6ycgJRByqHzHPhidP/PSKuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cHzC41X34zC9L; Fri, 05 Sep 2025 01:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5851O0YS043612; Fri, 5 Sep 2025 01:24:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5851O0iv043609; Fri, 5 Sep 2025 01:24:00 GMT (envelope-from git) Date: Fri, 5 Sep 2025 01:24:00 GMT Message-Id: <202509050124.5851O0iv043609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6e7cc49f94cf - stable/15 - Make stable/15 a stable branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6e7cc49f94cf9760125ab1699b6eb9b8311394a5 Auto-Submitted: auto-generated The branch stable/15 has been created by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6e7cc49f94cf9760125ab1699b6eb9b8311394a5 commit 6e7cc49f94cf9760125ab1699b6eb9b8311394a5 Author: Colin Percival AuthorDate: 2025-09-04 23:48:10 +0000 Commit: Colin Percival CommitDate: 2025-09-05 00:06:39 +0000 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 --- UPDATING | 18 +++--------------- libexec/rc/rc.conf | 2 +- release/Makefile | 3 --- release/release.conf.sample | 2 +- share/man/man5/src.conf.5 | 12 ++++++------ share/mk/src.opts.mk | 6 +++--- sys/sys/param.h | 2 +- 7 files changed, 15 insertions(+), 30 deletions(-) diff --git a/UPDATING b/UPDATING index 21c6e92d6454..2837b5aec0a8 100644 --- a/UPDATING +++ b/UPDATING @@ -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 . 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 diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 0ef3012892dd..82b6efa6ca62 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -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. diff --git a/release/Makefile b/release/Makefile index b6a9aa42c2e2..6fd3b2f61325 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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 diff --git a/release/release.conf.sample b/release/release.conf.sample index e583e49828d4..337019db6fa6 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -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. diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 2895c0cf4746..fa3ab3bc63b0 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -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: diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 85a003eb4eaf..60fe42372faa 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -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 \ diff --git a/sys/sys/param.h b/sys/sys/param.h index fc2a78883f1e..c21c086e15ad 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -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,