The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f8bad56164a43aa108498a97bd0021a943c0a02e
commit f8bad56164a43aa108498a97bd0021a943c0a02e Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2022-09-23 21:25:07 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2022-09-26 19:36:44 +0000 LinuxKPI: add the "dummy" includes directory to builds While we could add the dummy includes directory manually to only the drivers needing it, it seems a lot easier to simply add it to all without any expected harm. This is needed for more drivers (and to remove some #ifdef in current ones) with empty header files being present not yielding errors. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: hselasky, imp Differential Revision: https://reviews.freebsd.org/D36684 --- sys/conf/kern.pre.mk | 3 ++- sys/conf/kmod.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 75f5128c52d2..edde63e6850f 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -293,7 +293,8 @@ NORMAL_CTFCONVERT= @: .endif # Linux Kernel Programming Interface C-flags -LINUXKPI_INCLUDES= -I$S/compat/linuxkpi/common/include +LINUXKPI_INCLUDES= -I$S/compat/linuxkpi/common/include \ + -I$S/compat/linuxkpi/dummy/include LINUXKPI_C= ${NORMAL_C} ${LINUXKPI_INCLUDES} # Infiniband C flags. Correct include paths and omit errors that linux diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index b9f3a6ce006d..ace2f4cc3d4c 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -109,7 +109,8 @@ LINUXKPI_GENSRCS+= \ opt_stack.h LINUXKPI_INCLUDES+= \ - -I${SYSDIR}/compat/linuxkpi/common/include + -I${SYSDIR}/compat/linuxkpi/common/include \ + -I${SYSDIR}/compat/linuxkpi/dummy/include CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL
