From nobody Tue Dec 06 18:50:38 2022 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 4NRTy663Nbz4jdns; Tue, 6 Dec 2022 18:50:38 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NRTy65fFTz4PrY; Tue, 6 Dec 2022 18:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670352638; 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=Q9sEXHkyHlxUkS2k6EfOqYkxYRzvTUdXqlFOiUi/3Lc=; b=V012PoujIZrkNO/G8za3TaFeU8TTAINnjQzxTmhLuXdCd9I5GTgDk0LNLZOmwpDKFCw+eS EjPCKnzcyW4s/Xam+LDt0bryTjSSJH0gk8INg1qyi3uzW5jtJ7FcS3pOHifFfV8J4JEK7n oOtrnbpqZUPzf8LYh/Qd8XMBKX1LKo8CiB23SbVnzwEGSoPMOSoztgyviflVrJnB6Z36I/ X8I+nz2Sehr/p+kvY3GCLb87xctpbQu2cd896sYNKm2nO3ly/8IR7DCMjIoNme1rrbK0nj IJCaShfKoUOIrJkFAzqwrRe0nApLEBUFASXDFZi+or/pMtRo+xG5vfUXGbksAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670352638; 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=Q9sEXHkyHlxUkS2k6EfOqYkxYRzvTUdXqlFOiUi/3Lc=; b=kI4H2Cu1iJSRcmulvaICuOVWcTeGdgMw7ew/FvNIO0DlrPni0VWp29t2z58IsILO+bG0v6 A32gfDnJ1DCSdPe9vFZDwY6EQj5UJH8mMuTvR28gefkeQ7aHFWH354KQ1JggqO6dsz5qxT Vm7iLsjFLJG3cFrSbx7op6ucRuaD/mOk5lzROUR5LXchUNjSoxFcq61z1lSp2wBkPHAYjs L2CS8aP5s6nPLplHQmLR6Gkftih8Rl/gtQNHg/1RdxJZNAG0dm9/by6M+axls0qG6iHZfv uTzfam9xdhOieHFRLVZJQXI9lxtEtwftxIO9E8VfU0TO4+8VmkPQ8M5qW4bqtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670352638; a=rsa-sha256; cv=none; b=ge4d7cpDB4BOkf1bhb/k44ATnbpdhWBcq6LUgLSZvXK0iMDUC7GYr78JRXu7ROKTe16DBJ nObD3YNuWC+zjxYpJyDgwRjiR2TkGcFJDm3BatiAGiJSPi0siV4tag7WKhOHKx3t3P9I/g A/2MFohXfIRC7bzIaLOt/PlZCchasrjwt1vCFoz2B7C6JI5bq0siwHjc8NuCBkAlntl8mX hX/ykVl6tg/Lkr0RA/+/hr6Pzg7luw8CRNa2jkI41KW/xGY3c6UJm7ZTACtB1m4U1JwEXz oNiTKMSTZfHCSKLs4L9AbqkRG4GsXoyRRarmsgdxoqQMI+T+PfQRJT9zyYXAHg== 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 4NRTy64hsMzp1V; Tue, 6 Dec 2022 18:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B6Ioc8m084436; Tue, 6 Dec 2022 18:50:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B6Iocho084435; Tue, 6 Dec 2022 18:50:38 GMT (envelope-from git) Date: Tue, 6 Dec 2022 18:50:38 GMT Message-Id: <202212061850.2B6Iocho084435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 48e733eef92c - main - Add some more local.*.mk includes 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48e733eef92cf7c3bbde12d965c66766322e1f5e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=48e733eef92cf7c3bbde12d965c66766322e1f5e commit 48e733eef92cf7c3bbde12d965c66766322e1f5e Author: Simon J. Gerraty AuthorDate: 2022-12-06 18:49:54 +0000 Commit: Simon J. Gerraty CommitDate: 2022-12-06 18:49:54 +0000 Add some more local.*.mk includes These facilitate customizing the build with minimal churn. Reviewed by: stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D37592 --- share/mk/bsd.kmod.mk | 2 ++ share/mk/bsd.opts.mk | 2 ++ share/mk/bsd.sysdir.mk | 2 ++ 3 files changed, 6 insertions(+) diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk index 683967749e75..bb939f429546 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -1,4 +1,6 @@ # $FreeBSD$ +.-include + .include .include "${SYSDIR}/conf/kmod.mk" diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index d448656bd96d..a391e16a6d1b 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -104,6 +104,8 @@ __DEFAULT_NO_OPTIONS+= PIE __DEFAULT_YES_OPTIONS+=PIE .endif +.-include + .include .if ${MK_INIT_ALL_PATTERN} == "yes" && ${MK_INIT_ALL_ZERO} == "yes" diff --git a/share/mk/bsd.sysdir.mk b/share/mk/bsd.sysdir.mk index 665905e1d537..046ca433e6af 100644 --- a/share/mk/bsd.sysdir.mk +++ b/share/mk/bsd.sysdir.mk @@ -1,5 +1,7 @@ # $FreeBSD$ +.-include + # Search for kernel source tree in standard places. .if !defined(SYSDIR) .for _dir in ${SRCTOP:D${SRCTOP}/sys} \