From nobody Wed Sep 10 16:58:47 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 4cMRjM4R11z66b9h; Wed, 10 Sep 2025 16:58:47 +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 4cMRjM3bwVz3Spd; Wed, 10 Sep 2025 16:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757523527; 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=eUVrrcBYmKMZRI0wUBuYInidhsMRW2yJm1X+0kLfvzU=; b=vx0Bta5OvCbNcGxMLZJbPegIbQKpGumRROq/nwh1sMNK7f9FBZxhLtyPViA5d/TC9ry5zS 7Od82ymOPJJhUPpHPF2GTgOCIj2ecqqIyEvmdUL3GSxAkGaiS7Ih7GPKpIExzxjcWosTy6 e31ZCj4DdrzqBl9qhUs/r40DQyUzVdbgUg+VNdV97v+Vsudu6RiIN8XqAgvNMktyQJ0cnd FIw3l/MZhrKXhkyBIg59rDDOkZk+nZN8+HVg4egxgyinIdMgkCJTLju4JD68FBo7iym5zX 04B0KzCjhWx/0yUgee0LkBlHTnqp7RT5JcBHrPD3cujkHZTXFpmUDjLd+d5K7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757523527; 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=eUVrrcBYmKMZRI0wUBuYInidhsMRW2yJm1X+0kLfvzU=; b=dZ6VLaX96X6mfzqBlkd2wIcczTbAOiuAY2dOZgO6MWXEf437SL1Im6eVP3vccYbEsN3klG KlRh4irthytq5V+zyd/NeNgLnknoQTUramgB5mcUl0E4LPOZPypU4Gm2icql0KDo9S693x DHXPOgxX7+9aO8Mr52eodaUfPYEhiC8E9iGhyRHfKS3gdZRfU2QuEltlvBfwp0OjkeD0So kfJh/x7VTls86azrcGgaZKbrlq8Rqo4cus4dHIEFXUFbWMQyhxpJc2KLM+UYZ5V3QcSBbT d7+EN2Hb5c39ojvt62a+ji77t3WsOpN87SF2wR4JBvJqvZ0PWkJclnu0JfUnww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757523527; a=rsa-sha256; cv=none; b=ZfIBsdS9h218MTiOnbGEPDYOcK6iBDYE1hWDsN1BkqO10RlF//zcPfUM/QPqbhSdVPvXaT YaTUOIRksvNwWg1DnJbpOC3ZiYtAM4hHJoV+Zkh+GB3wA8lo6YAZw0mkLRNKUpWnqWQyb/ hfBrKBi2sonU9fj+d+2Uw/hKKhnn2MzS0cxhQFzFc7Tpvf+/W3wB6QVHpbdAvcQ7ZvxOqP BM2vqHB7Tp5q5EF04fk4EjZ8PrP63L0mQZlfP+JIdd+170T6xOmK+VdX4T2+WgOt9WThlL A4xtpYMHtVCjkKN7sAuQa/faoRG/StSwVRwVr+/R29uRIQgL4YOgeMYntmRNgg== 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 4cMRjM39XNzTkv; Wed, 10 Sep 2025 16:58:47 +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 58AGwlab061469; Wed, 10 Sep 2025 16:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58AGwlFE061466; Wed, 10 Sep 2025 16:58:47 GMT (envelope-from git) Date: Wed, 10 Sep 2025 16:58:47 GMT Message-Id: <202509101658.58AGwlFE061466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: dd8c666d8b78 - main - 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/main X-Git-Reftype: branch X-Git-Commit: dd8c666d8b78f6b9ddb691f0505837fa885ff3b4 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=dd8c666d8b78f6b9ddb691f0505837fa885ff3b4 commit dd8c666d8b78f6b9ddb691f0505837fa885ff3b4 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-10 16:57:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-10 16:58:30 +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 --- .gitignore | 1 + share/man/man5/src.conf.5 | 9 ++++++--- share/mk/src.sys.mk | 4 ++++ sys/conf/kern.pre.mk | 4 ++++ tools/build/options/makeman | 7 +++++-- 5 files changed, 20 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/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 2895c0cf4746..a1abbcbda01e 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 10, 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