From nobody Fri Oct 10 00:21:09 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 4cjS8Q5ydTz6CNkD; Fri, 10 Oct 2025 00:21:10 +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 4cjS8P3tm8z41kn; Fri, 10 Oct 2025 00:21:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760055669; 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=pHraHYuh77dpw0BEBex4liZADxruQPdaEIIXl4faF/4=; b=Vx0f59gnnw206tEIswzi/90cc5fT/8HPhrInBmWv3j6h5+raw/Bo6vg2w3bCnVK/jXN5pI n0/TUc3pVC26ARxDhrAeeN4l9aGsWlKrlZnYceH8hu380DO7hh1GusgzAUNJbX4ffimETV ywND5aJgj2qemj2BvctQevShczTbRRXx4dCmkwJ1mfYZTUWwQqvdUIIPJDzTbLiS7vUkDv vO4kR2X4MmyIs0QN5q6nwsiz0+4k5qmq1iGU+Hb5+nionUqAAgWT3KgzILGJd2+TOiDSbX DBakyYjJcOI4XqyZepuDhMzpU4IXo6PGClnZj7yhDOjPQI2imZrXNHuMeGGX8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760055669; 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=pHraHYuh77dpw0BEBex4liZADxruQPdaEIIXl4faF/4=; b=RF3mKdXtpymjjVnxY6D2S56uH5OcMvohRCW1i0IxZAAiZs5s3FslhomqWjKtZT1F9nmieX pZRiCO1RRDumdeKbpuY0MJKgAffuKriTjGZCyno+gpvAk55uQZUnAtiirftgIG51WwaAkb bx3ymy/6gW7lvzF4x+QOzGxup2ymCc5NiBUkXKAYfAmIcL+4zlCb8m/bafqQgksnF9kYY6 tYaqQXJWhjL8wM+3LP+ghMMsT734T/ogqOtysCNHsgKm1JSR7J467bGu+r1DQ8+j+vE3i9 n7aoh05trMqrg50FAFbd2lwPafJMtEUHN3pbkbHWpmXAXH0hl+zUt1tQAHOwCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760055669; a=rsa-sha256; cv=none; b=UlrQwFhxz4v+9lVpdHEsSMcD7fr2f2/9G+Ss6kGl1sjbzPHuSjP7I9DmLNyiFfKGAzckDm /g9Z4AOppi0LXezIIDnvjVzE12vYw638CU/PxL1wBMBWlhBNmfRkE5xhMLMASVOi8n+spR cqA/DoAlrTrkRWeiKOXeQVnVS4cLTHntulMHxF/Xh4v8GseOBsknEhytyHOWjckqiTn3KQ EXQ5v0xKOhBphJ7x0oRNJ/nw8zAUw4hVvSuqTjcWBao6NoDU5VSs+pKy1wndwijvaAZHxI impu/3d/P0c0uK5ua1GvqLgUwGrr6yb09XGy1ik5d1NOy5DSDzjqxKjoCRqtXg== 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 4cjS8P3BTWzh80; Fri, 10 Oct 2025 00:21:09 +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 59A0L9mS001903; Fri, 10 Oct 2025 00:21:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59A0L9mt001900; Fri, 10 Oct 2025 00:21:09 GMT (envelope-from git) Date: Fri, 10 Oct 2025 00:21:09 GMT Message-Id: <202510100021.59A0L9mt001900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3faa5bfece73 - main - kern: Don't need bsd.own.mk 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3faa5bfece73c62c2a3939e9b60365a899d16940 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3faa5bfece73c62c2a3939e9b60365a899d16940 commit 3faa5bfece73c62c2a3939e9b60365a899d16940 Author: Warner Losh AuthorDate: 2025-10-08 04:18:24 +0000 Commit: Warner Losh 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 -# 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 - # 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 + KLDXREF_CMD?= kldxref __DEFAULT_YES_OPTIONS = \