From nobody Thu Jun 23 22:23:05 2022 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 C64D785A2A5; Thu, 23 Jun 2022 22:23:06 +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 4LTZWt0pVBz4sbm; Thu, 23 Jun 2022 22:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656022986; 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=SLb0+FJ+OQOzvA1oWaAdwf9H3yZAWTLFLtwdxl4LcPE=; b=T9VL7aGnARcNdLA7Fy+emZYAlLYY2AC3xo83gmitNJbR/40/+7K2t5ekEAnkIvCHl8oGob wKwkYwwTwyBTvPAePmBWeuzQl9/PJE0Sypi46shQh6vG/AyxD6LlN6xlDbTAI0eL+gVMXp jhdG0YqypOlVoDTpP5yZ2N8v7332PNqGsKtXDHLpQTJ0EqlO7HSE2F4B76l6QYAkUGvv50 CSQSy2EtgdY7NhaV8c90y6ruUDpOCUvj+WF3Ez+tPaeU7eEV+jF7md4DQwaIeBOSbpYYpg lUCvfLmOYeDe35E8mQrXc/P+g/iH4/QOwV7ljXb3JvNAm40mCNpOqVqShoORXQ== 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 B8CA523C85; Thu, 23 Jun 2022 22:23:05 +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 25NMN54G055062; Thu, 23 Jun 2022 22:23:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NMN5t6055061; Thu, 23 Jun 2022 22:23:05 GMT (envelope-from git) Date: Thu, 23 Jun 2022 22:23:05 GMT Message-Id: <202206232223.25NMN5t6055061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d4af9eb430ce - stable/13 - modules: Only build MAC modules if options MAC is set 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d4af9eb430ceb48e74027193534b33c86ccda2cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656022986; 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=SLb0+FJ+OQOzvA1oWaAdwf9H3yZAWTLFLtwdxl4LcPE=; b=RUmizkNJjsbSiQBrt5fRZrNEj/CIv9jZgraGxAr9mtWnAGbf43bfg4kKyi9NpcG70NrCsE MoKCU5d+bKZGxGy+6Fl8IhUviR2D9hILkG4IxpwE2dyxD/NeRHHnVZX2WtkQM1Nv0zNlpT AAxc2GsjTfN54z7KH1YtBvcG6BLgPEgc6xPx77sj6o50e5V3RjhsVEl9/dO4Hmz3bnQ51L ToARf0HwsWQXhMiLgDH2+aeWhvUWyNFtfvFX82fXpeSWFYGILa/MXsjGZPaI+qWnADSviv Lf9GQ8MJB5EbuBH1TljhgLuXhg7lMGr+I3wo8yOvOHhyJhdYXr7+wLIQH+BZBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656022986; a=rsa-sha256; cv=none; b=KrSGTTVHK7EAhJyZQle2b0v6s/o3h0Mjo71LK+z7uyJrZ5n7UAxCIBQa/tUcxsqWsD7T+Z V1uZ3AzsDjjGVSbTDIv7M8ECZvKmFK7xJNps+iN/5bs+FMvikwybM1Lf9OsxvOY0XDEVrF t3dOYYFlodhvRYKDQQrMh45hhKiL0S/0BOU/TPE9wroY4h7+Sgm3BpIWxQ11YRMw9Klyxx vx9DGiUk7W35AchwUY4lgUM2d3G2p1zqMc7VDd0iZpAqzkWndwQLqvek/YnWe/Cws3/BvJ wsDqxjPT30PAc16WZKHG9PRSe6OJNELIK2kPaZHiLTbeDR/q0ADzN2Zw1DvwEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d4af9eb430ceb48e74027193534b33c86ccda2cc commit d4af9eb430ceb48e74027193534b33c86ccda2cc Author: Mitchell Horne AuthorDate: 2022-06-14 16:07:30 +0000 Commit: Mitchell Horne CommitDate: 2022-06-23 22:22:18 +0000 modules: Only build MAC modules if options MAC is set They are not loadable otherwise. Reviewed by: emaste MFC after: 1 week Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D35369 (cherry picked from commit 648a47b85476ed0f8e3c61800b134bd3bb6001ee) --- sys/modules/Makefile | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9b5474425916..a8dffd45cb4f 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -222,19 +222,19 @@ SUBDIR= \ linuxkpi_wlan \ ${_lio} \ lpt \ - mac_biba \ - mac_bsdextended \ - mac_ifoff \ - mac_lomac \ - mac_mls \ - mac_none \ - mac_ntpd \ - mac_partition \ - mac_portacl \ - mac_priority \ - mac_seeotheruids \ - mac_stub \ - mac_test \ + ${_mac_biba} \ + ${_mac_bsdextended} \ + ${_mac_ifoff} \ + ${_mac_lomac} \ + ${_mac_mls} \ + ${_mac_none} \ + ${_mac_ntpd} \ + ${_mac_partition} \ + ${_mac_portacl} \ + ${_mac_priority} \ + ${_mac_seeotheruids} \ + ${_mac_stub} \ + ${_mac_test} \ ${_malo} \ md \ mdio \ @@ -551,6 +551,24 @@ _rtw88fw= rtw88fw _vmware= vmware .endif +# MAC framework +.if ${KERN_OPTS:MMAC} || defined(ALL_MODULES) +_mac_biba= mac_biba +_mac_bsdextended= mac_bsdextended +_mac_ifoff= mac_ifoff +_mac_lomac= mac_lomac +_mac_mls= mac_mls +_mac_none= mac_none +_mac_ntpd= mac_ntpd +_mac_partition= mac_partition +_mac_pimd= mac_pimd +_mac_portacl= mac_portacl +_mac_priority= mac_priority +_mac_seeotheruids= mac_seeotheruids +_mac_stub= mac_stub +_mac_test= mac_test +.endif + .if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES) _netgraph= netgraph .endif