Attachment #247035 for bug #275741

Lines 22-28 Link Here

(-)b/share/man/man5/make.conf.5 (-4 / +6 lines)
22	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	22	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23	.\" SUCH DAMAGE.	23	.\" SUCH DAMAGE.
24	.\"	24	.\"
25	.Dd November 15, 2022	25	.Dd December 13, 2023
26	.Dt MAKE.CONF 5	26	.Dt MAKE.CONF 5
27	.Os	27	.Os
28	.Sh NAME	28	.Sh NAME
Lines 297-305 is built. Link Here
297	.It Va WITHOUT_MODULES	297	.It Va WITHOUT_MODULES
298	.Pq Vt str	298	.Pq Vt str
299	Set to a list of modules to exclude from the build.	299	Set to a list of modules to exclude from the build.
300	This provides a	300	Module names are relative to
301	somewhat easier way to exclude modules you are certain you will never	301	.Pa /usr/src/sys/modules
302	need than specifying	302	and can be of the form "foo bar baz" for modules at the top of the modules
		303	directory or the form "foo/bar foo/baz" for modules in a subdirectory.
		304	This is a way to exclude specific modules from being built compared to specifying
303	.Va MODULES_OVERRIDE .	305	.Va MODULES_OVERRIDE .
304	This is applied	306	This is applied
305	.Em after	307	.Em after




#-
# Copyright (c) 2023 Joshua Kinard <freebsd@kumba.dev>
#
# SPDX-License-Identifier: BSD-2-Clause
#

# Process WITHOUT_MODULES in SYSDIR/modules and any subdirectories.
#
# WITHOUT_MODULES holds a space-separated list of kernel module names
# that should not be built or installed.
#
# Module names are relative to SYSDIR/modules and matching names are
# removed from the SUBDIR variable in each Makefile that is processed
# under SYSDIR/MODULES.  Module names can have one of two forms:
#
#   1) A name of a top-level directory under SYSDIR/modules,
#      such as 'ipfw' or 'cd9660'.
#
#   2) A name of a relative path under SYSDIR/modules,
#      such as 'usb/atp' or 'hid/xb360gp'.
#
# This mk file should be included by any Makefile in SYSDIR/modules
# that defines a SUBDIR variable with a list of descendant module
# subdirectories.
#
# To include it, add the below directive at the bottom of a Makefile
# before any final include directives for "bsd.*.mk":
#
#   .include "${SYSDIR}/conf/kmod.without.mk"
#

.for kmod in ${WITHOUT_MODULES}
.  if ${kmod:M*/*}
     SUBDIR:=${SUBDIR:N${kmod:T}}
.  else
     SUBDIR:=${SUBDIR:N${kmod}}
.  endif
.endfor

Lines 901-909 _malo= malo Link Here

(-)b/sys/modules/Makefile (-3 / +2 lines)
901		901
902	SUBDIR+=${MODULES_EXTRA}	902	SUBDIR+=${MODULES_EXTRA}
903		903
904	.for reject in ${WITHOUT_MODULES}	904	# Process WITHOUT_MODULES
905	SUBDIR:= ${SUBDIR:N${reject}}	905	.include "${SYSDIR}/conf/kmod.without.mk"
906	.endfor
907		906
908	.endif # MODULES_OVERRIDE -- Keep last	907	.endif # MODULES_OVERRIDE -- Keep last
909		908

Lines 14-17 SRCS+= device_if.h bus_if.h pci_if.h Link Here

(-)b/sys/modules/aac/Makefile (+2 lines)
14	#CFLAGS+= -DAAC_DEBUG=2	14	#CFLAGS+= -DAAC_DEBUG=2
15	#SRCS+= aac_debug.c	15	#SRCS+= aac_debug.c
16		16
		17	.include "${SYSDIR}/conf/kmod.without.mk"
		18
17	.include <bsd.kmod.mk>	19	.include <bsd.kmod.mk>

Lines 17-20 SRCS+= device_if.h bus_if.h pci_if.h Link Here

(-)b/sys/modules/aacraid/Makefile (+2 lines)
17	#CFLAGS+= -DAACRAID_DEBUG=2	17	#CFLAGS+= -DAACRAID_DEBUG=2
18	#SRCS+= aacraid_debug.c	18	#SRCS+= aacraid_debug.c
19		19
		20	.include "${SYSDIR}/conf/kmod.without.mk"
		21
20	.include <bsd.kmod.mk>	22	.include <bsd.kmod.mk>

Lines 3-6 SUBDIR= acpi_asus acpi_asus_wmi acpi_dock acpi_fujitsu acpi_hp \ Link Here

(-)b/sys/modules/acpi/Makefile (+2 lines)
3	acpi_ged acpi_ibm acpi_panasonic acpi_sony acpi_toshiba \	3	acpi_ged acpi_ibm acpi_panasonic acpi_sony acpi_toshiba \
4	acpi_video acpi_wmi aibs	4	acpi_video acpi_wmi aibs
5		5
		6	.include "${SYSDIR}/conf/kmod.without.mk"
		7
6	.include <bsd.subdir.mk>	8	.include <bsd.subdir.mk>

Lines 17-20 cleanfirmware: Link Here

(-)b/sys/modules/aic7xxx/Makefile (+2 lines)
17	( cd .${CURDIR}/ahc ; ${MAKE} cleanfirmware )	17	( cd .${CURDIR}/ahc ; ${MAKE} cleanfirmware )
18	( cd .${CURDIR}/ahd ; ${MAKE} cleanfirmware )	18	( cd .${CURDIR}/ahd ; ${MAKE} cleanfirmware )
19		19
		20	.include "${SYSDIR}/conf/kmod.without.mk"
		21
20	.include <bsd.subdir.mk>	22	.include <bsd.subdir.mk>

Lines 52-55 CLEANFILES= ${GENSRCS} Link Here

(-)b/sys/modules/aic7xxx/ahc/Makefile (+2 lines)
52		52
53	EXPORT_SYMS= YES	53	EXPORT_SYMS= YES
54		54
		55	.include "${SYSDIR}/conf/kmod.without.mk"
		56
55	.include <bsd.kmod.mk>	57	.include <bsd.kmod.mk>

Lines 11-14 SUBDIR = \ Link Here

(-)b/sys/modules/allwinner/Makefile (+2 lines)
11	axp81x \	11	axp81x \
12	if_awg	12	if_awg
13		13
		14	.include "${SYSDIR}/conf/kmod.without.mk"
		15
14	.include <bsd.subdir.mk>	16	.include <bsd.subdir.mk>

Lines 3-8 Link Here

(-)b/sys/modules/arm_ti/Makefile (-2 / +4 lines)
3	SUBDIR = \	3	SUBDIR = \
4	../am335x_dmtpps \	4	../am335x_dmtpps \
5	am335x_ehrpwm \	5	am335x_ehrpwm \
6	ti_i2c \	6	ti_i2c
7		7
		8	.include "${SYSDIR}/conf/kmod.without.mk"
		9
8	.include <bsd.subdir.mk>	10	.include <bsd.subdir.mk>

Lines 1-6 Link Here

(-)b/sys/modules/ata/Makefile (-1 / +3 lines)
1		1
2	SUBDIR = atacore	2	SUBDIR = atacore
3	SUBDIR += ataisa	3	SUBDIR += ataisa
4	SUBDIR += atapci	4	SUBDIR += atapci
		5
		6	.include "${SYSDIR}/conf/kmod.without.mk"
5		7
6	.include <bsd.subdir.mk>	8	.include <bsd.subdir.mk>

Lines 9-12 SRCS+= ata_if.h bus_if.h device_if.h pci_if.h Link Here

(-)b/sys/modules/ata/atapci/Makefile (+2 lines)
9		9
10	EXPORT_SYMS= YES	10	EXPORT_SYMS= YES
11		11
		12	.include "${SYSDIR}/conf/kmod.without.mk"
		13
12	.include <bsd.kmod.mk>	14	.include <bsd.kmod.mk>

Lines 1-4 Link Here

(-)b/sys/modules/ata/atapci/chipsets/Makefile (+2 lines)
1		1
2	SUBDIR += ataacard ataacerlabs ataamd ataati atacenatek atacypress atacyrix atahighpoint ataintel ataite atajmicron atamarvell atamicron atanational atanetcell atanvidia atapromise ataserverworks atasiliconimage atasis atavia	2	SUBDIR += ataacard ataacerlabs ataamd ataati atacenatek atacypress atacyrix atahighpoint ataintel ataite atajmicron atamarvell atamicron atanational atanetcell atanvidia atapromise ataserverworks atasiliconimage atasis atavia
3		3
		4	.include "${SYSDIR}/conf/kmod.without.mk"
		5
4	.include <bsd.subdir.mk>	6	.include <bsd.subdir.mk>

Lines 5-8 SUBDIR= if_axa Link Here

(-)b/sys/modules/axgbe/Makefile (+2 lines)
5	SUBDIR= if_axp	5	SUBDIR= if_axp
6	.endif	6	.endif
7		7
		8	.include "${SYSDIR}/conf/kmod.without.mk"
		9
8	.include <bsd.subdir.mk>	10	.include <bsd.subdir.mk>

Lines 72-76 SUBDIR= bcma \ Link Here

(-)b/sys/modules/bhnd/Makefile (+2 lines)
72		72
73	EXPORT_SYMS= YES	73	EXPORT_SYMS= YES
74		74
		75	.include "${SYSDIR}/conf/kmod.without.mk"
		76
75	.include <bsd.kmod.mk>	77	.include <bsd.kmod.mk>
76	.include <bsd.subdir.mk>	78	.include <bsd.subdir.mk>

Lines 3-6 SUBDIR= bhnd_pci \ Link Here

(-)b/sys/modules/bhnd/cores/Makefile (+2 lines)
3	bhnd_pci_hostb \	3	bhnd_pci_hostb \
4	bhnd_pcib	4	bhnd_pcib
5		5
		6	.include "${SYSDIR}/conf/kmod.without.mk"
		7
6	.include <bsd.subdir.mk>	8	.include <bsd.subdir.mk>

Lines 6-9 SUBDIR= smbios vpd Link Here

(-)b/sys/modules/bios/Makefile (+2 lines)
6	SUBDIR+= smapi	6	SUBDIR+= smapi
7	.endif	7	.endif
8		8
		9	.include "${SYSDIR}/conf/kmod.without.mk"
		10
9	.include <bsd.subdir.mk>	11	.include <bsd.subdir.mk>

Lines 17-20 SUBDIR+= \ Link Here

(-)b/sys/modules/cc/Makefile (+2 lines)
17	cc_vegas	17	cc_vegas
18	.endif	18	.endif
19		19
		20	.include "${SYSDIR}/conf/kmod.without.mk"
		21
20	.include <bsd.subdir.mk>	22	.include <bsd.subdir.mk>

Lines 5-8 SYSDIR?=${SRCTOP}/sys Link Here

(-)b/sys/modules/cxgb/Makefile (+2 lines)
5	SUBDIR= cxgb	5	SUBDIR= cxgb
6	SUBDIR+= cxgb_t3fw	6	SUBDIR+= cxgb_t3fw
7		7
		8	.include "${SYSDIR}/conf/kmod.without.mk"
		9
8	.include <bsd.subdir.mk>	10	.include <bsd.subdir.mk>

Lines 32-35 SUBDIR+= fasttrap Link Here

(-)b/sys/modules/dtrace/Makefile (+2 lines)
32	SUBDIR+= systrace_freebsd32	32	SUBDIR+= systrace_freebsd32
33	.endif	33	.endif
34		34
		35	.include "${SYSDIR}/conf/kmod.without.mk"
		36
35	.include <bsd.subdir.mk>	37	.include <bsd.subdir.mk>

Lines 1-6 Link Here

(-)b/sys/modules/fdt/Makefile (-3 / +4 lines)
1	# Build dev/fdt modules.	1	# Build dev/fdt modules.
2		2
3	SUBDIR = \	3	SUBDIR = fdt_slicer
4	fdt_slicer \	4
5		5	.include "${SYSDIR}/conf/kmod.without.mk"
		6
6	.include <bsd.subdir.mk>	7	.include <bsd.subdir.mk>

Lines 5-8 SUBDIR= firewire \ Link Here

(-)b/sys/modules/firewire/Makefile (+2 lines)
5	sbp \	5	sbp \
6	sbp_targ	6	sbp_targ
7		7
		8	.include "${SYSDIR}/conf/kmod.without.mk"
		9
8	.include <bsd.subdir.mk>	10	.include <bsd.subdir.mk>

Lines 5-9 SUBDIR = Link Here

(-)b/sys/modules/flash/Makefile (-1 / +3 lines)
5	.if (${MACHINE_CPUARCH} == "aarch64") && !empty(OPT_FDT)	5	.if (${MACHINE_CPUARCH} == "aarch64") && !empty(OPT_FDT)
6	SUBDIR+= flexspi	6	SUBDIR+= flexspi
7	.endif	7	.endif
8		8
		9	.include "${SYSDIR}/conf/kmod.without.mk"
		10
9	.include <bsd.subdir.mk>	11	.include <bsd.subdir.mk>

Lines 30-33 SUBDIR= geom_bde \ Link Here

(-)b/sys/modules/geom/Makefile (+2 lines)
30	SUBDIR+= geom_ccd	30	SUBDIR+= geom_ccd
31	.endif	31	.endif
32		32
		33	.include "${SYSDIR}/conf/kmod.without.mk"
		34
33	.include <bsd.subdir.mk>	35	.include <bsd.subdir.mk>

Lines 7-10 SUBDIR= geom_part_apm \ Link Here

(-)b/sys/modules/geom/geom_part/Makefile (+2 lines)
7	geom_part_ldm \	7	geom_part_ldm \
8	geom_part_mbr	8	geom_part_mbr
9		9
		10	.include "${SYSDIR}/conf/kmod.without.mk"
		11
10	.include <bsd.subdir.mk>	12	.include <bsd.subdir.mk>

Lines 30-33 SUBDIR = gpiobus gpioiic gpioled gpiospi gpioths Link Here

(-)b/sys/modules/gpio/Makefile (+2 lines)
30	SUBDIR += gpiokeys gpiopps	30	SUBDIR += gpiokeys gpiopps
31	.endif	31	.endif
32		32
		33	.include "${SYSDIR}/conf/kmod.without.mk"
		34
33	.include <bsd.subdir.mk>	35	.include <bsd.subdir.mk>

Lines 20-23 SUBDIR += \ Link Here

(-)b/sys/modules/hid/Makefile (+2 lines)
20	ps4dshock \	20	ps4dshock \
21	xb360gp	21	xb360gp
22		22
		23	.include "${SYSDIR}/conf/kmod.without.mk"
		24
23	.include <bsd.subdir.mk>	25	.include <bsd.subdir.mk>

Lines 1-4 Link Here

(-)b/sys/modules/hyperv/Makefile (+2 lines)
1		1
2	SUBDIR = vmbus netvsc storvsc utilities hvsock hid	2	SUBDIR = vmbus netvsc storvsc utilities hvsock hid
3		3
		4	.include "${SYSDIR}/conf/kmod.without.mk"
		5
4	.include <bsd.subdir.mk>	6	.include <bsd.subdir.mk>

Lines 40-43 SUBDIR += hym8563 \ Link Here

(-)b/sys/modules/i2c/Makefile (+2 lines)
40	SUBDIR += iichid	40	SUBDIR += iichid
41	.endif	41	.endif
42		42
		43	.include "${SYSDIR}/conf/kmod.without.mk"
		44
43	.include <bsd.subdir.mk>	45	.include <bsd.subdir.mk>

Lines 8-11 SUBDIR += imcsmb Link Here

(-)b/sys/modules/i2c/controllers/Makefile (+2 lines)
8	SUBDIR += iicoc	8	SUBDIR += iicoc
9	.endif	9	.endif
10		10
		11	.include "${SYSDIR}/conf/kmod.without.mk"
		12
11	.include <bsd.subdir.mk>	13	.include <bsd.subdir.mk>

Lines 8-11 SUBDIR = \ Link Here

(-)b/sys/modules/i2c/mux/Makefile (+2 lines)
8	SUBDIR+= iic_gpiomux	8	SUBDIR+= iic_gpiomux
9	.endif	9	.endif
10		10
		11	.include "${SYSDIR}/conf/kmod.without.mk"
		12
11	.include <bsd.subdir.mk>	13	.include <bsd.subdir.mk>

Lines 6-11 SUBDIR = \ Link Here

(-)b/sys/modules/imx/Makefile (-2 / +4 lines)
6	imx6_snvs \	6	imx6_snvs \
7	imx_i2c \	7	imx_i2c \
8	imx_spi \	8	imx_spi \
9	imx_wdog \	9	imx_wdog
10		10
		11	.include "${SYSDIR}/conf/kmod.without.mk"
		12
11	.include <bsd.subdir.mk>	13	.include <bsd.subdir.mk>

Lines 26-29 SUBDIR+= ipmi_linux Link Here

(-)b/sys/modules/ipmi/Makefile (+2 lines)
26	SRCS+= ipmi_opal.c ofw_bus_if.h	26	SRCS+= ipmi_opal.c ofw_bus_if.h
27	.endif	27	.endif
28		28
		29	.include "${SYSDIR}/conf/kmod.without.mk"
		30
29	.include <bsd.kmod.mk>	31	.include <bsd.kmod.mk>

Lines 3-6 SUBDIR= ipw_bss \ Link Here

(-)b/sys/modules/ipwfw/Makefile (+2 lines)
3	ipw_ibss \	3	ipw_ibss \
4	ipw_monitor	4	ipw_monitor
5		5
		6	.include "${SYSDIR}/conf/kmod.without.mk"
		7
6	.include <bsd.subdir.mk>	8	.include <bsd.subdir.mk>

Lines 29-32 SUBDIR = ispfw Link Here

(-)b/sys/modules/ispfw/Makefile (+2 lines)
29	SUBDIR += isp_2400	29	SUBDIR += isp_2400
30	SUBDIR += isp_2500	30	SUBDIR += isp_2500
31		31
		32	.include "${SYSDIR}/conf/kmod.without.mk"
		33
32	.include <bsd.subdir.mk>	34	.include <bsd.subdir.mk>

Lines 3-6 SUBDIR= iwi_bss \ Link Here

(-)b/sys/modules/iwifw/Makefile (+2 lines)
3	iwi_ibss \	3	iwi_ibss \
4	iwi_monitor	4	iwi_monitor
5		5
		6	.include "${SYSDIR}/conf/kmod.without.mk"
		7
6	.include <bsd.subdir.mk>	8	.include <bsd.subdir.mk>

Lines 27-31 SUBDIR= \ Link Here

(-)b/sys/modules/iwlwififw/Makefile (+1 lines)
27	iwlwifi-so-a0-gf4-a0-pnvm \	27	iwlwifi-so-a0-gf4-a0-pnvm \
28	iwlwifi-ty-a0-gf-a0-pnvm	28	iwlwifi-ty-a0-gf-a0-pnvm
29		29
		30	.include "${SYSDIR}/conf/kmod.without.mk"
30		31
31	.include <bsd.subdir.mk>	32	.include <bsd.subdir.mk>

Lines 9-12 SUBDIR= iwm3160fw \ Link Here

(-)b/sys/modules/iwmfw/Makefile (+2 lines)
9	iwm9000fw \	9	iwm9000fw \
10	iwm9260fw	10	iwm9260fw
11		11
		12	.include "${SYSDIR}/conf/kmod.without.mk"
		13
12	.include <bsd.subdir.mk>	14	.include <bsd.subdir.mk>

Lines 13-16 SUBDIR= iwn100 \ Link Here

(-)b/sys/modules/iwnfw/Makefile (+2 lines)
13	iwn6000g2b \	13	iwn6000g2b \
14	iwn6050	14	iwn6050
15		15
		16	.include "${SYSDIR}/conf/kmod.without.mk"
		17
16	.include <bsd.subdir.mk>	18	.include <bsd.subdir.mk>

Lines 9-12 SUBDIR= Link Here

(-)b/sys/modules/khelp/Makefile (+2 lines)
9	SUBDIR+= h_ertt	9	SUBDIR+= h_ertt
10	.endif	10	.endif
11		11
		12	.include "${SYSDIR}/conf/kmod.without.mk"
		13
12	.include <bsd.subdir.mk>	14	.include <bsd.subdir.mk>

Lines 5-8 SUBDIR= ktest \ Link Here

(-)b/sys/modules/ktest/Makefile (+2 lines)
5	ktest_example \	5	ktest_example \
6	ktest_netlink_message_writer	6	ktest_netlink_message_writer
7		7
		8	.include "${SYSDIR}/conf/kmod.without.mk"
		9
8	.include <bsd.subdir.mk>	10	.include <bsd.subdir.mk>

Lines 1-4 Link Here

(-)b/sys/modules/libalias/Makefile (+2 lines)
1		1
2	SUBDIR= libalias modules	2	SUBDIR= libalias modules
3		3
		4	.include "${SYSDIR}/conf/kmod.without.mk"
		5
4	.include <bsd.subdir.mk>	6	.include <bsd.subdir.mk>

Lines 3-6 Link Here

(-)b/sys/modules/libalias/modules/Makefile (+2 lines)
3		3
4	SUBDIR= ${MODULES}	4	SUBDIR= ${MODULES}
5		5
		6	.include "${SYSDIR}/conf/kmod.without.mk"
		7
6	.include <bsd.subdir.mk>	8	.include <bsd.subdir.mk>

Lines 16-19 SRCS+= device_if.h bus_if.h pci_if.h Link Here

(-)b/sys/modules/mfi/Makefile (+2 lines)
16		16
17	EXPORT_SYMS= YES	17	EXPORT_SYMS= YES
18		18
		19	.include "${SYSDIR}/conf/kmod.without.mk"
		20
19	.include <bsd.kmod.mk>	21	.include <bsd.kmod.mk>

Lines 11-16 SRCS=mrsas.c mrsas_cam.c mrsas_ioctl.c mrsas_fp.c Link Here

(-)b/sys/modules/mrsas/Makefile (+1 lines)
11	SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h opt_scsi.h	11	SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h opt_scsi.h
12		12
13	#CFLAGS+= -MRSAS_DEBUG	13	#CFLAGS+= -MRSAS_DEBUG
		14	.include "${SYSDIR}/conf/kmod.without.mk"
14	.include <bsd.kmod.mk>	15	.include <bsd.kmod.mk>
15	CFLAGS+= -fgnu89-inline	16	CFLAGS+= -fgnu89-inline
16		17

Lines 4-7 SUBDIR+= mt7915 Link Here

(-)b/sys/modules/mt76/Makefile (+2 lines)
4	SUBDIR+= mt7921	4	SUBDIR+= mt7921
5	SUBDIR+= mt7996	5	SUBDIR+= mt7996
6		6
		7	.include "${SYSDIR}/conf/kmod.without.mk"
		8
7	.include <bsd.subdir.mk>	9	.include <bsd.subdir.mk>

Lines 5-8 SUBDIR+=mxge_ethp_z8e Link Here

(-)b/sys/modules/mxge/Makefile (+2 lines)
5	SUBDIR+=mxge_rss_eth_z8e	5	SUBDIR+=mxge_rss_eth_z8e
6	SUBDIR+=mxge_rss_ethp_z8e	6	SUBDIR+=mxge_rss_ethp_z8e
7		7
		8	.include "${SYSDIR}/conf/kmod.without.mk"
		9
8	.include <bsd.subdir.mk>	10	.include <bsd.subdir.mk>

Lines 61-64 _bluetooth= bluetooth Link Here

(-)b/sys/modules/netgraph/Makefile (+2 lines)
61	_mppc= mppc	61	_mppc= mppc
62	.endif	62	.endif
63		63
		64	.include "${SYSDIR}/conf/kmod.without.mk"
		65
64	.include <bsd.subdir.mk>	66	.include <bsd.subdir.mk>

Lines 8-11 SUBDIR= \ Link Here

(-)b/sys/modules/netgraph/bluetooth/Makefile (+2 lines)
8	ubt \	8	ubt \
9	ubtbcmfw	9	ubtbcmfw
10		10
		11	.include "${SYSDIR}/conf/kmod.without.mk"
		12
11	.include <bsd.subdir.mk>	13	.include <bsd.subdir.mk>

Lines 1-4 Link Here

(-)b/sys/modules/ntb/Makefile (+2 lines)
1		1
2	SUBDIR= ntb ntb_hw_amd ntb_hw_intel ntb_hw_plx ntb_transport ntb_tool if_ntb	2	SUBDIR= ntb ntb_hw_amd ntb_hw_intel ntb_hw_plx ntb_transport ntb_tool if_ntb
3		3
		4	.include "${SYSDIR}/conf/kmod.without.mk"
		5
4	.include <bsd.subdir.mk>	6	.include <bsd.subdir.mk>

Lines 6-9 SRCS = if_otus.c if_otusreg.h \ Link Here

(-)b/sys/modules/otus/Makefile (+2 lines)
6	bus_if.h device_if.h \	6	bus_if.h device_if.h \
7	opt_bus.h opt_usb.h opt_wlan.h usb_if.h usbdevs.h	7	opt_bus.h opt_usb.h opt_wlan.h usb_if.h usbdevs.h
8		8
		9	.include "${SYSDIR}/conf/kmod.without.mk"
		10
9	.include <bsd.kmod.mk>	11	.include <bsd.kmod.mk>

Lines 4-7 SYSDIR?=${SRCTOP}/sys Link Here

(-)b/sys/modules/ow/Makefile (+2 lines)
4		4
5	SUBDIR = ow owc ow_temp	5	SUBDIR = ow owc ow_temp
6		6
		7	.include "${SYSDIR}/conf/kmod.without.mk"
		8
7	.include <bsd.subdir.mk>	9	.include <bsd.subdir.mk>

Lines 11-14 SUBDIR += pwm_backlight Link Here

(-)b/sys/modules/pwm/Makefile (+2 lines)
11	.endif	11	.endif
12	.endif	12	.endif
13		13
		14	.include "${SYSDIR}/conf/kmod.without.mk"
		15
14	.include <bsd.subdir.mk>	16	.include <bsd.subdir.mk>

Lines 5-8 SUBDIR= qat_common \ Link Here

(-)b/sys/modules/qat/Makefile (+2 lines)
5	qat_hw \	5	qat_hw \
6	qat	6	qat
7		7
		8	.include "${SYSDIR}/conf/kmod.without.mk"
		9
8	.include <bsd.subdir.mk>	10	.include <bsd.subdir.mk>

Lines 7-10 SUBDIR= qat_c62x \ Link Here

(-)b/sys/modules/qatfw/Makefile (+2 lines)
7	qat_dh895xcc \	7	qat_dh895xcc \
8	qat_4xxx	8	qat_4xxx
9		9
		10	.include "${SYSDIR}/conf/kmod.without.mk"
		11
10	.include <bsd.subdir.mk>	12	.include <bsd.subdir.mk>

Lines 38-41 SUBDIR=qlnxe Link Here

(-)b/sys/modules/qlnx/Makefile (+2 lines)
38	SUBDIR+=qlnxev	38	SUBDIR+=qlnxev
39	SUBDIR+=qlnxr	39	SUBDIR+=qlnxr
40		40
		41	.include "${SYSDIR}/conf/kmod.without.mk"
		42
41	.include <bsd.subdir.mk>	43	.include <bsd.subdir.mk>

Lines 1-4 Link Here

(-)b/sys/modules/ralfw/Makefile (+2 lines)
1		1
2	SUBDIR= rt2561 rt2561s rt2661 rt2860	2	SUBDIR= rt2561 rt2561s rt2661 rt2860
3		3
		4	.include "${SYSDIR}/conf/kmod.without.mk"
		5
4	.include <bsd.subdir.mk>	6	.include <bsd.subdir.mk>

Lines 1-4 Link Here

(-)b/sys/modules/rdma/Makefile (+2 lines)
1		1
2	SUBDIR+= krping	2	SUBDIR+= krping
3		3
		4	.include "${SYSDIR}/conf/kmod.without.mk"
		5
4	.include <bsd.subdir.mk>	6	.include <bsd.subdir.mk>

Lines 7-10 SUBDIR = \ Link Here

(-)b/sys/modules/rockchip/Makefile (+2 lines)
7	rk_dwmmc \	7	rk_dwmmc \
8	rk_spi	8	rk_spi
9		9
		10	.include "${SYSDIR}/conf/kmod.without.mk"
		11
10	.include <bsd.subdir.mk>	12	.include <bsd.subdir.mk>

Lines 6-9 SUBDIR= \ Link Here

(-)b/sys/modules/rtw88fw/Makefile (+2 lines)
6	rtw8822c \	6	rtw8822c \
7	rtw8822c_wow	7	rtw8822c_wow
8		8
		9	.include "${SYSDIR}/conf/kmod.without.mk"
		10
9	.include <bsd.subdir.mk>	11	.include <bsd.subdir.mk>

Lines 3-6 SUBDIR= \ Link Here

(-)b/sys/modules/rtw89fw/Makefile (+2 lines)
3	rtw8852a \	3	rtw8852a \
4	rtw8852c	4	rtw8852c
5		5
		6	.include "${SYSDIR}/conf/kmod.without.mk"
		7
6	.include <bsd.subdir.mk>	8	.include <bsd.subdir.mk>

Lines 2-5 Link Here

(-)b/sys/modules/rtwnfw/Makefile (+2 lines)
2	SUBDIR= rtwnrtl8188eu rtwnrtl8192cT rtwnrtl8192cU rtwnrtl8192eu rtwnrtl8812au \	2	SUBDIR= rtwnrtl8188eu rtwnrtl8192cT rtwnrtl8192cU rtwnrtl8192eu rtwnrtl8812au \
3	rtwnrtl8821au rtwnrtl8192cE rtwnrtl8192cEB rtwnrtl8188ee	3	rtwnrtl8821au rtwnrtl8192cE rtwnrtl8192cEB rtwnrtl8188ee
4		4
		5	.include "${SYSDIR}/conf/kmod.without.mk"
		6
5	.include <bsd.subdir.mk>	7	.include <bsd.subdir.mk>

Lines 3-6 SUBDIR = Link Here

(-)b/sys/modules/sound/Makefile (+2 lines)
3	SUBDIR += sound	3	SUBDIR += sound
4	SUBDIR += driver	4	SUBDIR += driver
5		5
		6	.include "${SYSDIR}/conf/kmod.without.mk"
		7
6	.include <bsd.subdir.mk>	8	.include <bsd.subdir.mk>

Lines 23-26 SUBDIR+= cmi Link Here

(-)b/sys/modules/sound/driver/Makefile (+2 lines)
23	SUBDIR+= ai2s davbus	23	SUBDIR+= ai2s davbus
24	.endif	24	.endif
25		25
		26	.include "${SYSDIR}/conf/kmod.without.mk"
		27
26	.include <bsd.subdir.mk>	28	.include <bsd.subdir.mk>

Lines 4-13 SUBDIR = \ Link Here

(-)b/sys/modules/spi/Makefile (-2 / +4 lines)
4	at45d \	4	at45d \
5	${_atopcase} \	5	${_atopcase} \
6	mx25l \	6	mx25l \
7	spibus \	7	spibus
8		8
9	.if ${MACHINE_CPUARCH} == "i386" \|\| ${MACHINE_CPUARCH} == "amd64"	9	.if ${MACHINE_CPUARCH} == "i386" \|\| ${MACHINE_CPUARCH} == "amd64"
10	_atopcase=atopcase	10	_atopcase=atopcase
11	.endif	11	.endif
12		12
		13	.include "${SYSDIR}/conf/kmod.without.mk"
		14
13	.include <bsd.subdir.mk>	15	.include <bsd.subdir.mk>

Lines 1-4 Link Here

(-)b/sys/modules/splash/Makefile (+2 lines)
1		1
2	SUBDIR= bmp pcx txt	2	SUBDIR= bmp pcx txt
3		3
		4	.include "${SYSDIR}/conf/kmod.without.mk"
		5
4	.include <bsd.subdir.mk>	6	.include <bsd.subdir.mk>

Lines 13-16 SUBDIR= beastie \ Link Here

(-)b/sys/modules/syscons/Makefile (+2 lines)
13	star \	13	star \
14	warp	14	warp
15		15
		16	.include "${SYSDIR}/conf/kmod.without.mk"
		17
16	.include <bsd.subdir.mk>	18	.include <bsd.subdir.mk>

Lines 1-4 Link Here

(-)b/sys/modules/sysvipc/Makefile (+2 lines)
1		1
2	SUBDIR= sysvmsg sysvsem sysvshm	2	SUBDIR= sysvmsg sysvsem sysvshm
3		3
		4	.include "${SYSDIR}/conf/kmod.without.mk"
		5
4	.include <bsd.subdir.mk>	6	.include <bsd.subdir.mk>

Lines 15-18 _tcpmd5= tcpmd5 Link Here

(-)b/sys/modules/tcp/Makefile (+2 lines)
15	.endif	15	.endif
16	.endif	16	.endif
17		17
		18	.include "${SYSDIR}/conf/kmod.without.mk"
		19
18	.include <bsd.subdir.mk>	20	.include <bsd.subdir.mk>

Lines 5-8 SUBDIR+= callout_test Link Here

(-)b/sys/modules/tests/Makefile (+2 lines)
5		5
6	SUBDIR_PARALLEL=	6	SUBDIR_PARALLEL=
7		7
		8	.include "${SYSDIR}/conf/kmod.without.mk"
		9
8	.include <bsd.subdir.mk>	10	.include <bsd.subdir.mk>

Lines 103-106 _avr32dci= avr32dci Link Here

(-)b/sys/modules/usb/Makefile (+2 lines)
103	_uacpi= uacpi	103	_uacpi= uacpi
104	.endif	104	.endif
105		105
		106	.include "${SYSDIR}/conf/kmod.without.mk"
		107
106	.include <bsd.subdir.mk>	108	.include <bsd.subdir.mk>

Lines 1-4 Link Here

(-)b/sys/modules/usb/rsufw/Makefile (+2 lines)
1		1
2	SUBDIR= rsurtl8712fw	2	SUBDIR= rsurtl8712fw
3		3
		4	.include "${SYSDIR}/conf/kmod.without.mk"
		5
4	.include <bsd.subdir.mk>	6	.include <bsd.subdir.mk>

Lines 24-27 Link Here

(-)b/sys/modules/virtio/Makefile (+2 lines)
24		24
25	SUBDIR= virtio pci network block balloon scsi random console	25	SUBDIR= virtio pci network block balloon scsi random console
26		26
		27	.include "${SYSDIR}/conf/kmod.without.mk"
		28
27	.include <bsd.subdir.mk>	29	.include <bsd.subdir.mk>

Lines 26-29 SUBDIR= pvscsi vmxnet3 Link Here

(-)b/sys/modules/vmware/Makefile (+3 lines)
26	.if ${MACHINE_CPUARCH} == "amd64" \|\| ${MACHINE_CPUARCH} == "i386"	26	.if ${MACHINE_CPUARCH} == "amd64" \|\| ${MACHINE_CPUARCH} == "i386"
27	SUBDIR+= vmci	27	SUBDIR+= vmci
28	.endif	28	.endif
		29
		30	.include "${SYSDIR}/conf/kmod.without.mk"
		31
29	.include <bsd.subdir.mk>	32	.include <bsd.subdir.mk>

Lines 6-9 CFLAGS+= -DFDT Link Here

(-)b/sys/modules/vnic/Makefile (-1 / +2 lines)
6		6
7	SUBDIR = mrmlbus thunder_mdio thunder_bgx vnicpf vnicvf	7	SUBDIR = mrmlbus thunder_mdio thunder_bgx vnicpf vnicvf
8		8
		9	.include "${SYSDIR}/conf/kmod.without.mk"
		10
9	.include <bsd.subdir.mk>	11	.include <bsd.subdir.mk>
10	-

Return to bug 275741

Added Link Here

(-)b/sys/conf/kmod.without.mk (+38 lines)
1	#-
2	# Copyright (c) 2023 Joshua Kinard <freebsd@kumba.dev>
3	#
4	# SPDX-License-Identifier: BSD-2-Clause
5	#
6
7	# Process WITHOUT_MODULES in SYSDIR/modules and any subdirectories.
8	#
9	# WITHOUT_MODULES holds a space-separated list of kernel module names
10	# that should not be built or installed.
11	#
12	# Module names are relative to SYSDIR/modules and matching names are
13	# removed from the SUBDIR variable in each Makefile that is processed
14	# under SYSDIR/MODULES. Module names can have one of two forms:
15	#
16	# 1) A name of a top-level directory under SYSDIR/modules,
17	# such as 'ipfw' or 'cd9660'.
18	#
19	# 2) A name of a relative path under SYSDIR/modules,
20	# such as 'usb/atp' or 'hid/xb360gp'.
21	#
22	# This mk file should be included by any Makefile in SYSDIR/modules
23	# that defines a SUBDIR variable with a list of descendant module
24	# subdirectories.
25	#
26	# To include it, add the below directive at the bottom of a Makefile
27	# before any final include directives for "bsd.*.mk":
28	#
29	# .include "${SYSDIR}/conf/kmod.without.mk"
30	#
31
32	.for kmod in ${WITHOUT_MODULES}
33	. if ${kmod:M/}
34	SUBDIR:=${SUBDIR:N${kmod:T}}
35	. else
36	SUBDIR:=${SUBDIR:N${kmod}}
37	. endif
38	.endfor