From 9494cc136b92251a6e4a064bd5286e71709a850a Mon Sep 17 00:00:00 2001 From: Joshua Kinard Date: Wed, 13 Dec 2023 04:29:25 -0500 Subject: [PATCH] sys/modules: Fix processing of WITHOUT_MODULES This fixes the processing of WITHOUT_MODULES so that it works as stated in the FreeBSD documentation and make.conf(5). This variable is set in /etc/make.conf and contains a list of kernel module names (kmods) that should not be built and installed. For the longest time, including a kmod name in this variable would skip building it only if it was a top-level directory in SYSDIR/modules. If the kmod was one or more subdirectories below SYSDIR/modules, then it would still be built. This was because WITHOUT_MODULES was only being processed by the top-level SYSDIR/modules/Makefile, via this loop near the bottom: .for reject in ${WITHOUT_MODULES} SUBDIR:= ${SUBDIR:N${reject}} .endfor To fix this, the above loop is moved to a new mk file in SYSDIR/conf, called "kmod.without.mk", and expanded to have better processing of WITHOUT_MODULES, including the ability to specify kmods that are at lower subdirs in SYSDIR/modules. This mk file is included at the bottom of any Makefiles in SYSDIR/modules or below that define a SUBDIR variable. This changes the way that kmods are specified in WITHOUT_MODULES to be one of two forms: 1) A kmod name at the top-level of SYSDIR/modules. Example: 'WITHOUT_MODULES=foo bar baz', would prevent the kmods 'foo', 'bar', and 'baz' in SYSDIR/modules from being built by the kernel build system. This matches the existing capability currently available. 2) A kmod name in a subdirectory relative to SYSDIR/modules. Example: 'WITHOUT_MODULES=foo/bar foo/baz qux' would prevent kmods 'bar' and 'baz' under SYSDIR/modules/foo from being built, along with 'qux' in the top-level SYSDIR/modules from being built. PR: kern/275741 Submitted by: Joshua Kinard --- share/man/man5/make.conf.5 | 10 +++--- sys/conf/kmod.without.mk | 40 ++++++++++++++++++++++++ sys/modules/Makefile | 5 ++- sys/modules/aac/Makefile | 2 ++ sys/modules/aacraid/Makefile | 2 ++ sys/modules/acpi/Makefile | 2 ++ sys/modules/aic7xxx/Makefile | 2 ++ sys/modules/aic7xxx/ahc/Makefile | 2 ++ sys/modules/allwinner/Makefile | 2 ++ sys/modules/arm_ti/Makefile | 6 ++-- sys/modules/ata/Makefile | 4 ++- sys/modules/ata/atapci/Makefile | 2 ++ sys/modules/ata/atapci/chipsets/Makefile | 2 ++ sys/modules/axgbe/Makefile | 2 ++ sys/modules/bhnd/Makefile | 2 ++ sys/modules/bhnd/cores/Makefile | 2 ++ sys/modules/bios/Makefile | 2 ++ sys/modules/cc/Makefile | 2 ++ sys/modules/cxgb/Makefile | 2 ++ sys/modules/dtrace/Makefile | 2 ++ sys/modules/fdt/Makefile | 7 +++-- sys/modules/firewire/Makefile | 2 ++ sys/modules/flash/Makefile | 4 ++- sys/modules/geom/Makefile | 2 ++ sys/modules/geom/geom_part/Makefile | 2 ++ sys/modules/gpio/Makefile | 2 ++ sys/modules/hid/Makefile | 2 ++ sys/modules/hyperv/Makefile | 2 ++ sys/modules/i2c/Makefile | 2 ++ sys/modules/i2c/controllers/Makefile | 2 ++ sys/modules/i2c/mux/Makefile | 2 ++ sys/modules/imx/Makefile | 6 ++-- sys/modules/ipmi/Makefile | 2 ++ sys/modules/ipwfw/Makefile | 2 ++ sys/modules/ispfw/Makefile | 2 ++ sys/modules/iwifw/Makefile | 2 ++ sys/modules/iwlwififw/Makefile | 1 + sys/modules/iwmfw/Makefile | 2 ++ sys/modules/iwnfw/Makefile | 2 ++ sys/modules/khelp/Makefile | 2 ++ sys/modules/ktest/Makefile | 2 ++ sys/modules/libalias/Makefile | 2 ++ sys/modules/libalias/modules/Makefile | 2 ++ sys/modules/mfi/Makefile | 2 ++ sys/modules/mrsas/Makefile | 1 + sys/modules/mt76/Makefile | 2 ++ sys/modules/mxge/Makefile | 2 ++ sys/modules/netgraph/Makefile | 2 ++ sys/modules/netgraph/bluetooth/Makefile | 2 ++ sys/modules/ntb/Makefile | 2 ++ sys/modules/otus/Makefile | 2 ++ sys/modules/ow/Makefile | 2 ++ sys/modules/pwm/Makefile | 2 ++ sys/modules/qat/Makefile | 2 ++ sys/modules/qatfw/Makefile | 2 ++ sys/modules/qlnx/Makefile | 2 ++ sys/modules/ralfw/Makefile | 2 ++ sys/modules/rdma/Makefile | 2 ++ sys/modules/rockchip/Makefile | 2 ++ sys/modules/rtw88fw/Makefile | 2 ++ sys/modules/rtw89fw/Makefile | 2 ++ sys/modules/rtwnfw/Makefile | 2 ++ sys/modules/sound/Makefile | 2 ++ sys/modules/sound/driver/Makefile | 2 ++ sys/modules/spi/Makefile | 6 ++-- sys/modules/splash/Makefile | 2 ++ sys/modules/syscons/Makefile | 2 ++ sys/modules/sysvipc/Makefile | 2 ++ sys/modules/tcp/Makefile | 2 ++ sys/modules/tests/Makefile | 2 ++ sys/modules/usb/Makefile | 2 ++ sys/modules/usb/rsufw/Makefile | 2 ++ sys/modules/virtio/Makefile | 2 ++ sys/modules/vmware/Makefile | 3 ++ sys/modules/vnic/Makefile | 2 ++ 75 files changed, 201 insertions(+), 18 deletions(-) create mode 100644 sys/conf/kmod.without.mk diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index ebf1b8a119f7..6a0394e8f465 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 15, 2022 +.Dd December 12, 2023 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -297,9 +297,11 @@ is built. .It Va WITHOUT_MODULES .Pq Vt str Set to a list of modules to exclude from the build. -This provides a -somewhat easier way to exclude modules you are certain you will never -need than specifying +Module names are relative to +.Pa /usr/src/sys/modules +and can be of the form "foo bar baz" for modules at the top of the modules +directory or the form "foo/bar foo/baz" for modules in a subdirectory. +This is a way to exclude specific modules from being built compared to specifying .Va MODULES_OVERRIDE . This is applied .Em after diff --git a/sys/conf/kmod.without.mk b/sys/conf/kmod.without.mk new file mode 100644 index 000000000000..49052adcfeac --- /dev/null +++ b/sys/conf/kmod.without.mk @@ -0,0 +1,40 @@ +#- +# Copyright (c) 2023 Joshua Kinard +# +# 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*/*} +. if ${.CURDIR:T} == ${kmod:H} + SUBDIR:=${SUBDIR:N${kmod:T}} +. endif +. else + SUBDIR:=${SUBDIR:N${kmod}} +. endif +.endfor diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 112a2f345c94..4d3fd4f5982c 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -901,9 +901,8 @@ _malo= malo SUBDIR+=${MODULES_EXTRA} -.for reject in ${WITHOUT_MODULES} -SUBDIR:= ${SUBDIR:N${reject}} -.endfor +# Process WITHOUT_MODULES +.include "${SYSDIR}/conf/kmod.without.mk" .endif # MODULES_OVERRIDE -- Keep last diff --git a/sys/modules/aac/Makefile b/sys/modules/aac/Makefile index 549619098e78..ac502636e99f 100644 --- a/sys/modules/aac/Makefile +++ b/sys/modules/aac/Makefile @@ -14,4 +14,6 @@ SRCS+= device_if.h bus_if.h pci_if.h #CFLAGS+= -DAAC_DEBUG=2 #SRCS+= aac_debug.c +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/aacraid/Makefile b/sys/modules/aacraid/Makefile index 22815f9b4e56..4a81f83cb93b 100644 --- a/sys/modules/aacraid/Makefile +++ b/sys/modules/aacraid/Makefile @@ -17,4 +17,6 @@ SRCS+= device_if.h bus_if.h pci_if.h #CFLAGS+= -DAACRAID_DEBUG=2 #SRCS+= aacraid_debug.c +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile index ee921a23aeb7..bfa20e877a8d 100644 --- a/sys/modules/acpi/Makefile +++ b/sys/modules/acpi/Makefile @@ -3,4 +3,6 @@ SUBDIR= acpi_asus acpi_asus_wmi acpi_dock acpi_fujitsu acpi_hp \ acpi_ged acpi_ibm acpi_panasonic acpi_sony acpi_toshiba \ acpi_video acpi_wmi aibs +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/aic7xxx/Makefile b/sys/modules/aic7xxx/Makefile index 720a7709a31d..babe6dd86607 100644 --- a/sys/modules/aic7xxx/Makefile +++ b/sys/modules/aic7xxx/Makefile @@ -17,4 +17,6 @@ cleanfirmware: ( cd .${CURDIR}/ahc ; ${MAKE} cleanfirmware ) ( cd .${CURDIR}/ahd ; ${MAKE} cleanfirmware ) +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile index 8fc4c68feebb..d7a3f3f801d3 100644 --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -52,4 +52,6 @@ CLEANFILES= ${GENSRCS} EXPORT_SYMS= YES +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/allwinner/Makefile b/sys/modules/allwinner/Makefile index c74d772224db..231c7768b54a 100644 --- a/sys/modules/allwinner/Makefile +++ b/sys/modules/allwinner/Makefile @@ -11,4 +11,6 @@ SUBDIR = \ axp81x \ if_awg +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/arm_ti/Makefile b/sys/modules/arm_ti/Makefile index a90d4aee3a60..cdb2f00cfbf0 100644 --- a/sys/modules/arm_ti/Makefile +++ b/sys/modules/arm_ti/Makefile @@ -3,6 +3,8 @@ SUBDIR = \ ../am335x_dmtpps \ am335x_ehrpwm \ - ti_i2c \ - + ti_i2c + +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/ata/Makefile b/sys/modules/ata/Makefile index 3a9ad0dd123f..a4793153b94d 100644 --- a/sys/modules/ata/Makefile +++ b/sys/modules/ata/Makefile @@ -1,6 +1,8 @@ SUBDIR = atacore SUBDIR += ataisa -SUBDIR += atapci +SUBDIR += atapci + +.include "${SYSDIR}/conf/kmod.without.mk" .include diff --git a/sys/modules/ata/atapci/Makefile b/sys/modules/ata/atapci/Makefile index dfabcf765a16..54ba336a57aa 100644 --- a/sys/modules/ata/atapci/Makefile +++ b/sys/modules/ata/atapci/Makefile @@ -9,4 +9,6 @@ SRCS+= ata_if.h bus_if.h device_if.h pci_if.h EXPORT_SYMS= YES +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/ata/atapci/chipsets/Makefile b/sys/modules/ata/atapci/chipsets/Makefile index c17c84e6496c..984e368f3af9 100644 --- a/sys/modules/ata/atapci/chipsets/Makefile +++ b/sys/modules/ata/atapci/chipsets/Makefile @@ -1,4 +1,6 @@ SUBDIR += ataacard ataacerlabs ataamd ataati atacenatek atacypress atacyrix atahighpoint ataintel ataite atajmicron atamarvell atamicron atanational atanetcell atanvidia atapromise ataserverworks atasiliconimage atasis atavia +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/axgbe/Makefile b/sys/modules/axgbe/Makefile index bc5c5b1299f3..3ef956c5bccb 100644 --- a/sys/modules/axgbe/Makefile +++ b/sys/modules/axgbe/Makefile @@ -5,4 +5,6 @@ SUBDIR= if_axa SUBDIR= if_axp .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/bhnd/Makefile b/sys/modules/bhnd/Makefile index 032d33210079..e0da3f1959ca 100644 --- a/sys/modules/bhnd/Makefile +++ b/sys/modules/bhnd/Makefile @@ -72,5 +72,7 @@ SUBDIR= bcma \ EXPORT_SYMS= YES +.include "${SYSDIR}/conf/kmod.without.mk" + .include .include diff --git a/sys/modules/bhnd/cores/Makefile b/sys/modules/bhnd/cores/Makefile index 610d735f723d..80a1c0d4fcfc 100644 --- a/sys/modules/bhnd/cores/Makefile +++ b/sys/modules/bhnd/cores/Makefile @@ -3,4 +3,6 @@ SUBDIR= bhnd_pci \ bhnd_pci_hostb \ bhnd_pcib +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/bios/Makefile b/sys/modules/bios/Makefile index 1fe7e1e1bba3..8316de89a97a 100644 --- a/sys/modules/bios/Makefile +++ b/sys/modules/bios/Makefile @@ -6,4 +6,6 @@ SUBDIR= smbios vpd SUBDIR+= smapi .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile index c3e59aef331e..9c7a6798c3cf 100644 --- a/sys/modules/cc/Makefile +++ b/sys/modules/cc/Makefile @@ -17,4 +17,6 @@ SUBDIR+= \ cc_vegas .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile index 144d8f8531db..3e2b62126442 100644 --- a/sys/modules/cxgb/Makefile +++ b/sys/modules/cxgb/Makefile @@ -5,4 +5,6 @@ SYSDIR?=${SRCTOP}/sys SUBDIR= cxgb SUBDIR+= cxgb_t3fw +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 73c71c5bd1fb..f63cda03e7c0 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -32,4 +32,6 @@ SUBDIR+= fasttrap SUBDIR+= systrace_freebsd32 .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/fdt/Makefile b/sys/modules/fdt/Makefile index bc27e25a0897..16c35a5ae059 100644 --- a/sys/modules/fdt/Makefile +++ b/sys/modules/fdt/Makefile @@ -1,6 +1,7 @@ # Build dev/fdt modules. -SUBDIR = \ - fdt_slicer \ - +SUBDIR = fdt_slicer + +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/firewire/Makefile b/sys/modules/firewire/Makefile index d5254f528eea..1ffababab541 100644 --- a/sys/modules/firewire/Makefile +++ b/sys/modules/firewire/Makefile @@ -5,4 +5,6 @@ SUBDIR= firewire \ sbp \ sbp_targ +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/flash/Makefile b/sys/modules/flash/Makefile index 0a11b1242579..e169c3afd2bb 100644 --- a/sys/modules/flash/Makefile +++ b/sys/modules/flash/Makefile @@ -5,5 +5,7 @@ SUBDIR = .if (${MACHINE_CPUARCH} == "aarch64") && !empty(OPT_FDT) SUBDIR+= flexspi .endif - + +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile index 48f225d0a33e..16d551013776 100644 --- a/sys/modules/geom/Makefile +++ b/sys/modules/geom/Makefile @@ -30,4 +30,6 @@ SUBDIR= geom_bde \ SUBDIR+= geom_ccd .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/geom/geom_part/Makefile b/sys/modules/geom/geom_part/Makefile index f9a6076f184b..3dfdbd13aef3 100644 --- a/sys/modules/geom/geom_part/Makefile +++ b/sys/modules/geom/geom_part/Makefile @@ -7,4 +7,6 @@ SUBDIR= geom_part_apm \ geom_part_ldm \ geom_part_mbr +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/gpio/Makefile b/sys/modules/gpio/Makefile index ffb3581d1f01..0401c88089a8 100644 --- a/sys/modules/gpio/Makefile +++ b/sys/modules/gpio/Makefile @@ -30,4 +30,6 @@ SUBDIR = gpiobus gpioiic gpioled gpiospi gpioths SUBDIR += gpiokeys gpiopps .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/hid/Makefile b/sys/modules/hid/Makefile index f2331d7db728..990988853196 100644 --- a/sys/modules/hid/Makefile +++ b/sys/modules/hid/Makefile @@ -20,4 +20,6 @@ SUBDIR += \ ps4dshock \ xb360gp +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/hyperv/Makefile b/sys/modules/hyperv/Makefile index 4b9c179641de..bf854707a469 100644 --- a/sys/modules/hyperv/Makefile +++ b/sys/modules/hyperv/Makefile @@ -1,4 +1,6 @@ SUBDIR = vmbus netvsc storvsc utilities hvsock hid +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile index 6c976e9303f1..e142838f42be 100644 --- a/sys/modules/i2c/Makefile +++ b/sys/modules/i2c/Makefile @@ -40,4 +40,6 @@ SUBDIR += hym8563 \ SUBDIR += iichid .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/i2c/controllers/Makefile b/sys/modules/i2c/controllers/Makefile index ce96c9d5ac8e..31bd5d0e56e6 100644 --- a/sys/modules/i2c/controllers/Makefile +++ b/sys/modules/i2c/controllers/Makefile @@ -8,4 +8,6 @@ SUBDIR += imcsmb SUBDIR += iicoc .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/i2c/mux/Makefile b/sys/modules/i2c/mux/Makefile index e197793e5d86..847e4ec2c456 100644 --- a/sys/modules/i2c/mux/Makefile +++ b/sys/modules/i2c/mux/Makefile @@ -8,4 +8,6 @@ SUBDIR = \ SUBDIR+= iic_gpiomux .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/imx/Makefile b/sys/modules/imx/Makefile index 09de5774ef88..cbaa188e9bce 100644 --- a/sys/modules/imx/Makefile +++ b/sys/modules/imx/Makefile @@ -6,6 +6,8 @@ SUBDIR = \ imx6_snvs \ imx_i2c \ imx_spi \ - imx_wdog \ - + imx_wdog + +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/ipmi/Makefile b/sys/modules/ipmi/Makefile index 41c4d5285314..d0cbe194a567 100644 --- a/sys/modules/ipmi/Makefile +++ b/sys/modules/ipmi/Makefile @@ -26,4 +26,6 @@ SUBDIR+= ipmi_linux SRCS+= ipmi_opal.c ofw_bus_if.h .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/ipwfw/Makefile b/sys/modules/ipwfw/Makefile index 59ff2c4face3..cc7d72dd3682 100644 --- a/sys/modules/ipwfw/Makefile +++ b/sys/modules/ipwfw/Makefile @@ -3,4 +3,6 @@ SUBDIR= ipw_bss \ ipw_ibss \ ipw_monitor +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/ispfw/Makefile b/sys/modules/ispfw/Makefile index 8f0634a2a638..51a4e0284422 100644 --- a/sys/modules/ispfw/Makefile +++ b/sys/modules/ispfw/Makefile @@ -29,4 +29,6 @@ SUBDIR = ispfw SUBDIR += isp_2400 SUBDIR += isp_2500 +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/iwifw/Makefile b/sys/modules/iwifw/Makefile index 6d5ab036cd34..adf0c702388d 100644 --- a/sys/modules/iwifw/Makefile +++ b/sys/modules/iwifw/Makefile @@ -3,4 +3,6 @@ SUBDIR= iwi_bss \ iwi_ibss \ iwi_monitor +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/iwlwififw/Makefile b/sys/modules/iwlwififw/Makefile index 756fb2f73af7..ada0d22b0dc4 100644 --- a/sys/modules/iwlwififw/Makefile +++ b/sys/modules/iwlwififw/Makefile @@ -27,5 +27,6 @@ SUBDIR= \ iwlwifi-so-a0-gf4-a0-pnvm \ iwlwifi-ty-a0-gf-a0-pnvm +.include "${SYSDIR}/conf/kmod.without.mk" .include diff --git a/sys/modules/iwmfw/Makefile b/sys/modules/iwmfw/Makefile index 1ff62d2ab3bf..9506788e33f4 100644 --- a/sys/modules/iwmfw/Makefile +++ b/sys/modules/iwmfw/Makefile @@ -9,4 +9,6 @@ SUBDIR= iwm3160fw \ iwm9000fw \ iwm9260fw +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/iwnfw/Makefile b/sys/modules/iwnfw/Makefile index 487009a027a8..06060e235b38 100644 --- a/sys/modules/iwnfw/Makefile +++ b/sys/modules/iwnfw/Makefile @@ -13,4 +13,6 @@ SUBDIR= iwn100 \ iwn6000g2b \ iwn6050 +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile index 173ba679bfcf..149d66311e7f 100644 --- a/sys/modules/khelp/Makefile +++ b/sys/modules/khelp/Makefile @@ -9,4 +9,6 @@ SUBDIR= SUBDIR+= h_ertt .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/ktest/Makefile b/sys/modules/ktest/Makefile index 151db53417df..a7e810f55312 100644 --- a/sys/modules/ktest/Makefile +++ b/sys/modules/ktest/Makefile @@ -5,4 +5,6 @@ SUBDIR= ktest \ ktest_example \ ktest_netlink_message_writer +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/libalias/Makefile b/sys/modules/libalias/Makefile index 02fd37c62a1c..e6142b37b7dd 100644 --- a/sys/modules/libalias/Makefile +++ b/sys/modules/libalias/Makefile @@ -1,4 +1,6 @@ SUBDIR= libalias modules +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/libalias/modules/Makefile b/sys/modules/libalias/modules/Makefile index a2c945965ca2..b35fa1d25daa 100644 --- a/sys/modules/libalias/modules/Makefile +++ b/sys/modules/libalias/modules/Makefile @@ -3,4 +3,6 @@ SUBDIR= ${MODULES} +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/mfi/Makefile b/sys/modules/mfi/Makefile index a7541ab85e2f..c265f9d8430c 100644 --- a/sys/modules/mfi/Makefile +++ b/sys/modules/mfi/Makefile @@ -16,4 +16,6 @@ SRCS+= device_if.h bus_if.h pci_if.h EXPORT_SYMS= YES +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/mrsas/Makefile b/sys/modules/mrsas/Makefile index 5704c3d0298f..c143eff29bc8 100644 --- a/sys/modules/mrsas/Makefile +++ b/sys/modules/mrsas/Makefile @@ -11,6 +11,7 @@ SRCS=mrsas.c mrsas_cam.c mrsas_ioctl.c mrsas_fp.c SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h opt_scsi.h #CFLAGS+= -MRSAS_DEBUG +.include "${SYSDIR}/conf/kmod.without.mk" .include CFLAGS+= -fgnu89-inline diff --git a/sys/modules/mt76/Makefile b/sys/modules/mt76/Makefile index 95d6e10a6991..ac96d6c336ad 100644 --- a/sys/modules/mt76/Makefile +++ b/sys/modules/mt76/Makefile @@ -4,4 +4,6 @@ SUBDIR+= mt7915 SUBDIR+= mt7921 SUBDIR+= mt7996 +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/mxge/Makefile b/sys/modules/mxge/Makefile index 358adf109d18..9279242d4893 100644 --- a/sys/modules/mxge/Makefile +++ b/sys/modules/mxge/Makefile @@ -5,4 +5,6 @@ SUBDIR+=mxge_ethp_z8e SUBDIR+=mxge_rss_eth_z8e SUBDIR+=mxge_rss_ethp_z8e +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile index 94560d5c51d7..14976dc14f68 100644 --- a/sys/modules/netgraph/Makefile +++ b/sys/modules/netgraph/Makefile @@ -61,4 +61,6 @@ _bluetooth= bluetooth _mppc= mppc .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/netgraph/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/Makefile index 2587dac65150..be2426b12d96 100644 --- a/sys/modules/netgraph/bluetooth/Makefile +++ b/sys/modules/netgraph/bluetooth/Makefile @@ -8,4 +8,6 @@ SUBDIR= \ ubt \ ubtbcmfw +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/ntb/Makefile b/sys/modules/ntb/Makefile index a1374f3d0f7c..ffbb64ce70a9 100644 --- a/sys/modules/ntb/Makefile +++ b/sys/modules/ntb/Makefile @@ -1,4 +1,6 @@ SUBDIR= ntb ntb_hw_amd ntb_hw_intel ntb_hw_plx ntb_transport ntb_tool if_ntb +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/otus/Makefile b/sys/modules/otus/Makefile index 8c0c322429b8..b3984dd1f625 100644 --- a/sys/modules/otus/Makefile +++ b/sys/modules/otus/Makefile @@ -6,4 +6,6 @@ SRCS = if_otus.c if_otusreg.h \ bus_if.h device_if.h \ opt_bus.h opt_usb.h opt_wlan.h usb_if.h usbdevs.h +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/ow/Makefile b/sys/modules/ow/Makefile index 498dd15a0328..1f7167e835f2 100644 --- a/sys/modules/ow/Makefile +++ b/sys/modules/ow/Makefile @@ -4,4 +4,6 @@ SYSDIR?=${SRCTOP}/sys SUBDIR = ow owc ow_temp +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/pwm/Makefile b/sys/modules/pwm/Makefile index 9b18a0be3908..f46d6876e736 100644 --- a/sys/modules/pwm/Makefile +++ b/sys/modules/pwm/Makefile @@ -11,4 +11,6 @@ SUBDIR += pwm_backlight .endif .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/qat/Makefile b/sys/modules/qat/Makefile index e32a9495f7bc..3005ad647424 100644 --- a/sys/modules/qat/Makefile +++ b/sys/modules/qat/Makefile @@ -5,4 +5,6 @@ SUBDIR= qat_common \ qat_hw \ qat +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/qatfw/Makefile b/sys/modules/qatfw/Makefile index b135fd2d95dc..afdfae251980 100644 --- a/sys/modules/qatfw/Makefile +++ b/sys/modules/qatfw/Makefile @@ -7,4 +7,6 @@ SUBDIR= qat_c62x \ qat_dh895xcc \ qat_4xxx +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/qlnx/Makefile b/sys/modules/qlnx/Makefile index 2121f9d586a6..0d4822195256 100644 --- a/sys/modules/qlnx/Makefile +++ b/sys/modules/qlnx/Makefile @@ -38,4 +38,6 @@ SUBDIR=qlnxe SUBDIR+=qlnxev SUBDIR+=qlnxr +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/ralfw/Makefile b/sys/modules/ralfw/Makefile index e8c74240cb1b..1d52c2defa39 100644 --- a/sys/modules/ralfw/Makefile +++ b/sys/modules/ralfw/Makefile @@ -1,4 +1,6 @@ SUBDIR= rt2561 rt2561s rt2661 rt2860 +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/rdma/Makefile b/sys/modules/rdma/Makefile index 81ddf6e71bf5..a1c83fab2af3 100644 --- a/sys/modules/rdma/Makefile +++ b/sys/modules/rdma/Makefile @@ -1,4 +1,6 @@ SUBDIR+= krping +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/rockchip/Makefile b/sys/modules/rockchip/Makefile index 3463f2538b19..12f675256cf0 100644 --- a/sys/modules/rockchip/Makefile +++ b/sys/modules/rockchip/Makefile @@ -7,4 +7,6 @@ SUBDIR = \ rk_dwmmc \ rk_spi +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/rtw88fw/Makefile b/sys/modules/rtw88fw/Makefile index 1b92f28e024e..dba3f7ee6a5d 100644 --- a/sys/modules/rtw88fw/Makefile +++ b/sys/modules/rtw88fw/Makefile @@ -6,4 +6,6 @@ SUBDIR= \ rtw8822c \ rtw8822c_wow +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/rtw89fw/Makefile b/sys/modules/rtw89fw/Makefile index 7732d9d868ff..d8816d8065ff 100644 --- a/sys/modules/rtw89fw/Makefile +++ b/sys/modules/rtw89fw/Makefile @@ -3,4 +3,6 @@ SUBDIR= \ rtw8852a \ rtw8852c +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/rtwnfw/Makefile b/sys/modules/rtwnfw/Makefile index f747612c7526..4475560ed707 100644 --- a/sys/modules/rtwnfw/Makefile +++ b/sys/modules/rtwnfw/Makefile @@ -2,4 +2,6 @@ SUBDIR= rtwnrtl8188eu rtwnrtl8192cT rtwnrtl8192cU rtwnrtl8192eu rtwnrtl8812au \ rtwnrtl8821au rtwnrtl8192cE rtwnrtl8192cEB rtwnrtl8188ee +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/sound/Makefile b/sys/modules/sound/Makefile index 41314d322c9d..381a111bffa2 100644 --- a/sys/modules/sound/Makefile +++ b/sys/modules/sound/Makefile @@ -3,4 +3,6 @@ SUBDIR = SUBDIR += sound SUBDIR += driver +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile index af5e3259aa00..804eca64339f 100644 --- a/sys/modules/sound/driver/Makefile +++ b/sys/modules/sound/driver/Makefile @@ -23,4 +23,6 @@ SUBDIR+= cmi SUBDIR+= ai2s davbus .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/spi/Makefile b/sys/modules/spi/Makefile index 494ff6dc2dcf..ca89c2e5d9a1 100644 --- a/sys/modules/spi/Makefile +++ b/sys/modules/spi/Makefile @@ -4,10 +4,12 @@ SUBDIR = \ at45d \ ${_atopcase} \ mx25l \ - spibus \ - + spibus + .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _atopcase=atopcase .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/splash/Makefile b/sys/modules/splash/Makefile index 8af6313e578f..f88a4ec2e79a 100644 --- a/sys/modules/splash/Makefile +++ b/sys/modules/splash/Makefile @@ -1,4 +1,6 @@ SUBDIR= bmp pcx txt +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/syscons/Makefile b/sys/modules/syscons/Makefile index 83c2e34bfcb7..997110a54982 100644 --- a/sys/modules/syscons/Makefile +++ b/sys/modules/syscons/Makefile @@ -13,4 +13,6 @@ SUBDIR= beastie \ star \ warp +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/sysvipc/Makefile b/sys/modules/sysvipc/Makefile index fc9e27c81732..cc6a86c71242 100644 --- a/sys/modules/sysvipc/Makefile +++ b/sys/modules/sysvipc/Makefile @@ -1,4 +1,6 @@ SUBDIR= sysvmsg sysvsem sysvshm +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/tcp/Makefile b/sys/modules/tcp/Makefile index 3b6df4bc18e9..b22f99b41967 100644 --- a/sys/modules/tcp/Makefile +++ b/sys/modules/tcp/Makefile @@ -15,4 +15,6 @@ _tcpmd5= tcpmd5 .endif .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/tests/Makefile b/sys/modules/tests/Makefile index abc077ffa2df..d614cc86d270 100644 --- a/sys/modules/tests/Makefile +++ b/sys/modules/tests/Makefile @@ -5,4 +5,6 @@ SUBDIR+= callout_test SUBDIR_PARALLEL= +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile index 2c593495b9a4..529ec67f713a 100644 --- a/sys/modules/usb/Makefile +++ b/sys/modules/usb/Makefile @@ -103,4 +103,6 @@ _avr32dci= avr32dci _uacpi= uacpi .endif +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/usb/rsufw/Makefile b/sys/modules/usb/rsufw/Makefile index ae154d51f979..e5025f34abfd 100644 --- a/sys/modules/usb/rsufw/Makefile +++ b/sys/modules/usb/rsufw/Makefile @@ -1,4 +1,6 @@ SUBDIR= rsurtl8712fw +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/virtio/Makefile b/sys/modules/virtio/Makefile index 7622e58c0c93..8f9851eaa3fc 100644 --- a/sys/modules/virtio/Makefile +++ b/sys/modules/virtio/Makefile @@ -24,4 +24,6 @@ SUBDIR= virtio pci network block balloon scsi random console +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/vmware/Makefile b/sys/modules/vmware/Makefile index 3d75f1a59c5c..cf186011d8c6 100644 --- a/sys/modules/vmware/Makefile +++ b/sys/modules/vmware/Makefile @@ -26,4 +26,7 @@ SUBDIR= pvscsi vmxnet3 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SUBDIR+= vmci .endif + +.include "${SYSDIR}/conf/kmod.without.mk" + .include diff --git a/sys/modules/vnic/Makefile b/sys/modules/vnic/Makefile index 79e206c8ef08..9173277d061a 100644 --- a/sys/modules/vnic/Makefile +++ b/sys/modules/vnic/Makefile @@ -6,4 +6,6 @@ CFLAGS+= -DFDT SUBDIR = mrmlbus thunder_mdio thunder_bgx vnicpf vnicvf +.include "${SYSDIR}/conf/kmod.without.mk" + .include -- 2.43.0