From nobody Tue Sep 16 13:59:07 2025 X-Original-To: dev-commits-src-branches@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 4cR3RJ1JcSz67Jbg; Tue, 16 Sep 2025 13:59:08 +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 4cR3RH6j61z3Wy4; Tue, 16 Sep 2025 13:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031148; 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=prJpZbeJi9iKnzhLFSOl2wO54BRLK/4zhpH8+D+33DY=; b=thLZRt5vvHAFGNZeEQGtEC3Bxw2qxsg4XUZGucO7BI4LQH2kbcT6JtLIxOtFcbVfnLdVW8 ozXVjQA01XDh/DTu+7sfU6iERETLJMEQnDta6YTyBX+bQd0wGoszgwtxXOVhEcFlIlf+C0 1e1ClwZ4N5tC730X/qx6PLOplcGs9B4s0weffOQoXszP0p4ErUpyGxqtc2SxxowLr4T5sO e/g8Xlu7whd8l5a3DWCSticGpCKTUptUt/UO6tqSEbFGin21ipx6ECFD9y6MMyvzHgykFa 3GupqDSnbX6d6g9kmGkQgHOkP1x1TqALtP21c4d+TTDcdtmlPVdTyRgV7XzGbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031147; 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=prJpZbeJi9iKnzhLFSOl2wO54BRLK/4zhpH8+D+33DY=; b=RhcHSB1w6FcX9BG6OmFZa/1gFIG4W75hDeriGJ+7P6JSc6ECxoXYnxh/mQmcogxnKBmF/q fIt3odkx2JTfKrgHYMOQ26QkcHvYOCLJa3n67RKMvEVXc9yQEEh6jSg5Q6fUZTipVTRDd8 39tvtp2bsAKmzpnU9QoiNkGRFoMEUQJNL+k+PxJmUSVQPPQnytu2iG6z4SkZ10kAq0ztEa Q0d91QhXsIuYEdH/PV5WY8LXj2V2+H792kKYaDIu9Bo6tPQHTAkhzyuJciO/NmbqU4cwfD x9AwmHgAQZ7+4fMkxRMqyIdkFvO76WS4uLiFrve7xpiUEoisZmISLzgzjm7J5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031147; a=rsa-sha256; cv=none; b=sHCl0X0UwAyr3fRbbfFJ7SmVa0iecSBkTatsc1P3lCqSa5fx0imgY3kWWc+3TWsAwSLhoj OswL67Vbi0QJQ1cGUDal86Woc0csheQwW55PdwACbeBRpJfCcsYOILy/RPz7tTG8elhV4f 0eXbgGFYEAqF8RkbGRUVK1vtYEpSemMuhV3YfCh4h5zpLOlh1fzIijg6qLxImkYCR8YIWV 3Ye6Z2wWAgmkhbJE3myXcVB/52XuHwBpzG1Z+cGQ4Zud4Elcj6p9aAPZPHCZ7k/4elQXOL jyTBwExhM0IXHRyqdQmbcEqlMk7Xa7mjQZp0DtuP2gxCCpLbpsK0mIE64WfQQw== 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 4cR3RH69HszkR8; Tue, 16 Sep 2025 13:59:07 +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 58GDx771064356; Tue, 16 Sep 2025 13:59:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDx7GH064353; Tue, 16 Sep 2025 13:59:07 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:07 GMT Message-Id: <202509161359.58GDx7GH064353@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: 340f2a651313 - stable/15 - src.sys.mk: Support src.conf in SRCTOP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: 340f2a651313c21b302a9137ba4765a6f04cd1cd Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=340f2a651313c21b302a9137ba4765a6f04cd1cd commit 340f2a651313c21b302a9137ba4765a6f04cd1cd Author: Dag-Erling Smørgrav AuthorDate: 2025-09-10 16:57:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:27:43 +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 3ed711f301ac..a53a26f16d4f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ tags .clangd .ccls-cache sys/*/compile +/src.conf diff --git a/UPDATING b/UPDATING index 2837b5aec0a8..ae4f14a24858 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. + 20250905: __FreeBSD_version 1500064 after branching stable/15 from main. diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index aa6a85754a8c..d251bf0cd9e7 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 September 5, 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 2b9fc255a26d..ec035fb71e54 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 1fcfd6467e7f..0251486247da 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 ddd08443e61c..88ee5884d180 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -222,8 +222,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