From nobody Tue Jun 14 16:10:29 2022 X-Original-To: dev-commits-src-main@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 E2133833F4C; Tue, 14 Jun 2022 16:10:29 +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 4LMth561zlz3DSM; Tue, 14 Jun 2022 16:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655223029; 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=yPHBFzGY3tTQKRHkePWT0ynp7i9EEoL4Bd4JB3i0TSM=; b=xjJnmv3O3ATTEalROa3eEwz40WGJ5d/BS9uY8qnUGS1yJQj6L7iJgNV2wEH/OWuIx0kV0H ZRwohKPWknuHHT0pWnOS5Rt2fjIpEUIXCSmMvGww4XqZMtqHFQwQ2FTwr1bz+KcqAljMMZ HCI8Z93OG4MS7KrtJQM6wMXtQoZEcNsG9qr+6sPYcmcRWTbNHj715s7oB+IzVHzf7evdGr nUENdgq6lis3km4u/f9saB5ibD762dnoiG0DICYDWHwGGdvYYKkd68PRTwvKzCZMY2YDWH tZ93L0OXkjUJb/4JtoMNqnovNgSc1JE5s1uIAxrs41SW0CTYVTZHnnJ/HgVbdA== 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 AEDB452E3; Tue, 14 Jun 2022 16:10:29 +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 25EGATsD093621; Tue, 14 Jun 2022 16:10:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25EGATBT093620; Tue, 14 Jun 2022 16:10:29 GMT (envelope-from git) Date: Tue, 14 Jun 2022 16:10:29 GMT Message-Id: <202206141610.25EGATBT093620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 648a47b85476 - main - modules: Only build MAC modules if options MAC is set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 648a47b85476ed0f8e3c61800b134bd3bb6001ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655223029; 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=yPHBFzGY3tTQKRHkePWT0ynp7i9EEoL4Bd4JB3i0TSM=; b=Ak8MSXb/GdCKI1GX9LRixksCFa04yt3oXEXUGQswkoopfFI+kmi8N/xyr+J1cZ7DvrbQNn Ap0MuLXmqixUp5izcX7ufwE1EVhhMyFBK/yLe0cLfZmniCig1Rj53cwTCSPZaE6+SHYcV5 Ksayp7H3tYeu4HKriSIEVfoj3eUld0F6iEgsDUyMO8m4STzURlczGTlfKH17+2ytiW5V9/ 38v6kgGRPgpaCF8rK+LiGLNXHkAKHoz5Ox2HeL6g4U8wnwGspsvJp49qn0amzkL8DcaMYz cilAoNq5HXxSTihLlv9jy6qT7PDqa3V9oSkeiFjWa+b75BmCeFWQoTZPTs1J+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655223029; a=rsa-sha256; cv=none; b=sAfigryoFAhLtEGiLbi3JsQagGVXrt9CljmywhT6RnRK0/NR6IUOiAsZDIBCCJ22UpQuIm J2F0LxT6yl6rytD4JQp5thIZOc/25NimPCOnerbEUhma1TRNfYTq1DgkQo7MHMBAdzmg4x cP3+XXCASuPw2Xpy8XsxbU+r1Or9FarMp6t55PFscVgcEnsM2u6UmCF8jEgpDnhEMz+A6q 9J1U1MYv7bUUhWvZKMX3O3YZE67zBPWEl9xBRpR2ytGETIQOFeVmU8io+RJ7qSV3ru75tr DurK7f9qdTyRwqYbDCQZyar1ChUMlEx1l/YXu4Wt4mPiMEytapA6Ki99ptWz8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=648a47b85476ed0f8e3c61800b134bd3bb6001ee commit 648a47b85476ed0f8e3c61800b134bd3bb6001ee Author: Mitchell Horne AuthorDate: 2022-06-14 16:07:30 +0000 Commit: Mitchell Horne CommitDate: 2022-06-14 16:10:08 +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 --- sys/modules/Makefile | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 29a77e07399e..6917074ea5c8 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -216,20 +216,20 @@ SUBDIR= \ linuxkpi_wlan \ ${_lio} \ lpt \ - mac_biba \ - mac_bsdextended \ - mac_ifoff \ - mac_lomac \ - mac_mls \ - mac_none \ - mac_ntpd \ - mac_partition \ - mac_pimd \ - 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_pimd} \ + ${_mac_portacl} \ + ${_mac_priority} \ + ${_mac_seeotheruids} \ + ${_mac_stub} \ + ${_mac_test} \ ${_malo} \ ${_mana} \ md \ @@ -541,6 +541,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