git: 3faa5bfece73 - main - kern: Don't need bsd.own.mk
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 10 Oct 2025 00:21:09 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3faa5bfece73c62c2a3939e9b60365a899d16940 commit 3faa5bfece73c62c2a3939e9b60365a899d16940 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2025-10-08 04:18:24 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2025-10-10 00:12:38 +0000 kern: Don't need bsd.own.mk Instead, replace it with bsd.init.mk and remove old comments about FreeBSD 10.x compat. We used to need bsd.own.mk, but now can suffice with bsd.init.mk since kern.opts.mk doesn't included that in too many places. Sponsored by: Netflix --- sys/conf/dtb.build.mk | 4 ---- sys/conf/kern.opts.mk | 10 +++------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/sys/conf/dtb.build.mk b/sys/conf/dtb.build.mk index 327d69106244..7eb0db5e8b80 100644 --- a/sys/conf/dtb.build.mk +++ b/sys/conf/dtb.build.mk @@ -1,7 +1,3 @@ - -.include <bsd.init.mk> -# Grab all the options for a kernel build. For backwards compat, we need to -# do this after bsd.own.mk. .include "kern.opts.mk" DTC?= dtc diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 045e55d1b19a..cef4dd11ba58 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -4,6 +4,7 @@ # parts to omit (eg CDDL or SOURCELESS_HOST). Some of these will cause # config.mk to define symbols in various opt_*.h files. + # # Define MK_* variables (which are either "yes" or "no") for users # to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the @@ -13,17 +14,12 @@ # that haven't been converted over. # -# Note: bsd.own.mk must be included before the rest of kern.opts.mk to make -# building on 10.x and earlier work. This should be removed when that's no -# longer supported since it confounds the defaults (since it uses the host's -# notion of defaults rather than what's default in current when building -# within sys/modules). -.include <bsd.own.mk> - # These options are used by the kernel build process (kern.mk and kmod.mk) # They have to be listed here so we can build modules outside of the # src tree. +.include <bsd.init.mk> + KLDXREF_CMD?= kldxref __DEFAULT_YES_OPTIONS = \