Ticket #17645: build-without-dkms.patch

vboxhost-5.2.8_OSE

@@ -132 +132 @@
  MOD_OBJS += SUPDrvDTrace.o
 endif
 
-MOD_INCL  = $(addprefix -I$(KBUILD_EXTMOD)/vboxdrv,/ /include /r0drv/linux)
+MOD_INCL  = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
 ifdef VBOX_WITH_NATIVE_DTRACE
  MOD_INCL += -I/usr/include/linux -I/usr/include
 endif
@@ -158 +158 @@
 endif
 
 # build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxdrv/include/VBox/SUPDrvMangling.h \
+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \
         -fno-omit-frame-pointer -fno-pie
 
 include $(obj)/Makefile.include.footer

vboxnetflt/Makefile

@@ -46 +46 @@
         math/gcc/umoddi3.o
 endif
 
-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetflt,/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
 MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
         -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
         -Wno-declaration-after-statement
@@ -71 +71 @@
 endif
 
 # build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetflt/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
 
 include $(obj)/Makefile.include.footer

vboxnetadp/Makefile

@@ -42 +42 @@
         math/gcc/umoddi3.o
 endif
 
-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetadp,/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
 MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
             -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
             -Wno-declaration-after-statement
@@ -67 +67 @@
 endif
 
 # build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
 
 include $(obj)/Makefile.include.footer

vboxhost-5.2.8_OSE

@@ -46 +46 @@
         math/gcc/umoddi3.o
 endif
 
-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxpci,/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
 MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
         -DRT_WITH_VBOX -DVBOX_WITH_HARDENING
 ifeq ($(BUILD_TARGET_ARCH),amd64)
@@ -68 +68 @@
 endif
 
 # build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxpci/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
 
 include $(obj)/Makefile.include.footer