From nobody Tue Sep 16 13:59:16 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 4cR3RT4PKHz67Jrr; Tue, 16 Sep 2025 13:59:17 +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 4cR3RT1kCZz3XK5; Tue, 16 Sep 2025 13:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031157; 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=EvW2OmLS3FzlGt1e8hctpbssYbfyQkfenZjBDagOwxg=; b=pI68wgy0OSR1nAflwW0rBv1AGpYyQwD8e5XQExjAXglzRnFb71/zZkcjdocnnWto171cjH NxvcBG+4pCJzntE4soGj063HQV0D/q6EeGr8330fDkLM/7NKe3TLQ/7N6cOf+M+nj8/pxP eAG9sF1vPliE95+gGJ2U6Zb1mgJlZ8CodbHgwRxT5PxFmo6dBIfOH3vd9MTvChg+ncDsER eWhJyGy7b7Xr97FQtb2qhOAI4VpY4GnWFtMsyHvvyMf8Og9D0k/nyd8KDwIJKAkvV4caAr Ep1+XBwiU4SmwpHnJUcGLM48ABV9E4MO9xyjOKn9ycGoAGYUIr91aY5UTMA7Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031157; 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=EvW2OmLS3FzlGt1e8hctpbssYbfyQkfenZjBDagOwxg=; b=l2saLQ7EA382nk0JQlv+6e/nFRZonM0CW4khSujRbttZBOWx8XiSlhbNdK0xVpnxrO8G/S AgDYnMG6+VMtlw9Lp1hZBPVIyvTihGmT7PBMh5nLEp66p3HdLP4wD9tGL6BHy3zhC93mLy 9PAUX43EvFDB0CnpsgB/n5tPD9/RldHIuPj1XPdxKHc8gpDcOxMhdCBPb05im5nRpNNnMt Xz3hv5s8r51DfNCDlnwfuv7/xR4XagRoczTG60hwM+RkZ9lv9u5JCoFXs5NkoRxrQnTik4 bfmdd+Et2avx/oQEg4jTw0D0ydU7civYCcFqZMI0+I5Qle3tHODUHzu3rYcPgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031157; a=rsa-sha256; cv=none; b=sv3UB7Ubh6mR07aL0a4FuvRKSBc/f/8aumklAVutW2dST8Wo4D+0aY+h402jF610YPxFzy O8QX3wn2MxKSDes/IfMAF5RIJS8UuJvlh7px/WlAfc7y0teLImdCejil6DIcTmIxurbhZK SlznpbFsDba/YZV7AiSSqnePCS4FHxFiRZYbuA5RvECrolCpAKpcASWOeUO1XYpzFR6/E6 HdTWjoP7a+OOdC5H54fP/xre3Jg2mJqqqBxi4znrpRfbh+dbrfnXp+b6ZYPU/J1si//Zfh cLF3tuEirVZW51RPyp7aBLEdKf9wv7pL19XpVhBIkj6qtVS+SmKQCWpcTUPSvg== 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 4cR3RT0lxlzkRD; Tue, 16 Sep 2025 13:59:17 +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 58GDxGqO064672; Tue, 16 Sep 2025 13:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxGpM064668; Tue, 16 Sep 2025 13:59:16 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:16 GMT Message-Id: <202509161359.58GDxGpM064668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a5bf37963aeb - stable/14 - src.sys.mk: Support src.conf in SRCTOP 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a5bf37963aeb6ee2dc2c26cb39a1931ea7558055 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a5bf37963aeb6ee2dc2c26cb39a1931ea7558055 commit a5bf37963aeb6ee2dc2c26cb39a1931ea7558055 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-10 16:57:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:27:55 +0000 src.sys.mk: Support src.conf in SRCTOP If SRCCONF is not defined and src.conf exists at the top level of the source tree, use that instead of /etc/src.conf. MFC after: 3 days Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D52470 (cherry picked from commit dd8c666d8b78f6b9ddb691f0505837fa885ff3b4) UPDATING: mention the src.conf change Fixes: dd8c666d8b78 ("src.sys.mk: Support src.conf in SRCTOP") (cherry picked from commit ab2fea3f9a5a58f0ba90499ad3a8614e3dca0c5f) --- .gitignore | 1 + UPDATING | 5 +++++ share/man/man5/src.conf.5 | 9 ++++++--- share/mk/src.sys.mk | 4 ++++ sys/conf/kern.pre.mk | 4 ++++ tools/build/options/makeman | 7 +++++-- 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 785568271794..ffa366fde357 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ tags .cache .clangd .ccls-cache +/src.conf diff --git a/UPDATING b/UPDATING index 965ecac80055..644e17fc55be 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ 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. +20250916: + If SRCCONF is unset and a file named src.conf is present at + the top of the source tree, it will now be used instead of + /etc/src.conf. + 20250823: Commit 3f61ececacd8 changed the internal KAPI between the NFS modules. As such, they all need to be rebuilt diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 63fba6d2ac01..24d041d055a4 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 June 13, 2025 +.Dd September 16, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -29,8 +29,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index d5c2af0c559d..d563859586b0 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -6,7 +6,11 @@ .if !defined(_WITHOUT_SRCCONF) # Allow user to configure things that only effect src tree builds. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if !empty(SRCCONF) && \ (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && \ !target(_srcconf_included_) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index ff19cd75d3ea..becd11da64c9 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -8,7 +8,11 @@ # the rest of /usr/src, but they still always process SRCCONF even though # the normal mechanisms to prevent that (compiling out of tree) won't # work. To ensure they do work, we have to duplicate thee few lines here. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) .include "${SRCCONF}" _srcconf_included_: diff --git a/tools/build/options/makeman b/tools/build/options/makeman index 4e44c78b0278..fb75990cc383 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -179,8 +179,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable