D55576.id172895.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55576.id172895.diff
View Options

	diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
	--- a/sys/conf/kern.opts.mk
	+++ b/sys/conf/kern.opts.mk
	@@ -47,6 +47,7 @@
	SOURCELESS_UCODE \
	SPLIT_KERNEL_DEBUG \
	TESTS \
	+ USB \
	USB_GADGET_EXAMPLES \
	ZFS

	@@ -207,6 +208,10 @@
	MK_DTRACE:= no
	.endif

	+.if ${MK_USB} == "no"
	+MK_USB_GADGET_EXAMPLES:= no
	+.endif
	+
	# Some modules only compile successfully if option FDT is set, due to #ifdef FDT
	# wrapped around declarations. Module makefiles can optionally compile such
	# things using .if !empty(OPT_FDT)
	diff --git a/sys/modules/Makefile b/sys/modules/Makefile
	--- a/sys/modules/Makefile
	+++ b/sys/modules/Makefile
	@@ -357,7 +357,7 @@
	${_rtw89} \
	rtwn \
	rtwn_pci \
	- rtwn_usb \
	+ ${_rtwn_usb} \
	${_rtwnfw} \
	${_s3} \
	${_safe} \
	@@ -412,7 +412,7 @@
	${_ufshci} \
	uinput \
	unionfs \
	- usb \
	+ ${_usb} \
	${_vesa} \
	${_vf_i2c} \
	virtio \
	@@ -939,20 +939,12 @@
	_neta= neta
	.endif

	-.if ${MACHINE_CPUARCH} == "amd64"
	-_thunderbolt= thunderbolt
	-.endif
	-
	.if !(${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 110000)
	# LLVM 10 crashes when building if_malo_pci.c, fixed in LLVM11:
	# https://bugs.llvm.org/show_bug.cgi?id=44351
	_malo= malo
	.endif

	-.if ${MACHINE_CPUARCH} == "amd64" \|\| ${MACHINE_CPUARCH} == "aarch64"
	-_ufshci=ufshci
	-.endif
	-
	SUBDIR+=${MODULES_EXTRA}

	.for reject in ${WITHOUT_MODULES}