Changeset 93419 in vbox for trunk/src/VBox/Devices/Makefile.kmk

Timestamp:

Jan 24, 2022 6:13:22 PM (3 years ago)

Author:

vboxsync

Message:

*.kmk: Introducing VBOX_WITH_R0_MODULES and VBOX_WITH_HWVIRT for helping with bugref:9898 and bugref:9044 (apple stuff at least).

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -51 +51 @@
  #
  if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS))
-  LIBRARIES += ServicesR0
-  DLLS      += VBoxDDU VBoxDD VBoxDD2
-  $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VBoxDDR0
+  DLLS       += VBoxDDU VBoxDD VBoxDD2
+  ifdef VBOX_WITH_R0_MODULES
+   LIBRARIES += ServicesR0
+   ifdef VBOX_WITH_VBOXR0_AS_DLL
+    DLLS     += VBoxDDR0
+   else
+    SYSMODS  += VBoxDDR0
+   endif
+  endif
   ifdef VBOX_WITH_RAW_MODE
    SYSMODS   += VBoxDDRC
   endif
  else
-  DLLS      += VBoxDDU
+  DLLS       += VBoxDDU
  endif
 
@@ -1515 +1521 @@
   $(call VBOX_SET_VER_INFO_DLL,VBoxEhciR3,PUEL Extension Pack - EHCI Device)
 
-  $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VBoxEhciR0
-  VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel
-  VBoxEhciR0_SOURCES  = \
-        USB/DevEHCI.cpp \
-        USB/DevXHCI.cpp
-  $(call VBOX_SET_VER_INFO_R0,VBoxEhciR0,PUEL Extension Pack - EHCI Device$(COMMA) ring-0)
-  ifdef VBOX_WITH_KMOD_WRAPPED_R0_MODS # Wrapper kmod for VBoxEhciR0.r0
-   INSTALLS.linux += vbox_vboxehcir0-src
-   vbox_vboxehcir0-src_INST = bin/src/vbox_vboxehcir0/
-   vbox_vboxehcir0-src_SYMLINKS = \
-        SUPWrapperMod-linux.c=>../common/SUPWrapperMod-linux.c \
-        Makefile-wrapper.gmk=>../common/Makefile-wrapper.gmk
-   vbox_vboxehcir0-src_SOURCES = \
-        $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/Makefile-vbox_vboxehcir0.gmk=>Makefile \
-        $(VBoxEhciR0_0_OUTDIR)/VBoxEhciR0.r0=>VBoxEhciR0.r0 \
-        $(VBoxEhciR0_0_OUTDIR)/VBoxEhciR0.debug=>VBoxEhciR0.debug
+  ifdef VBOX_WITH_R0_MODULES
+   ifdef VBOX_WITH_VBOXR0_AS_DLL
+    DLLS    += VBoxEhciR0
+   else
+    SYSMODS += VBoxEhciR0
+   endif
+   VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel
+   VBoxEhciR0_SOURCES  = \
+        USB/DevEHCI.cpp \
+        USB/DevXHCI.cpp
+   $(call VBOX_SET_VER_INFO_R0,VBoxEhciR0,PUEL Extension Pack - EHCI Device$(COMMA) ring-0)
+   ifdef VBOX_WITH_KMOD_WRAPPED_R0_MODS # Wrapper kmod for VBoxEhciR0.r0
+    INSTALLS.linux += vbox_vboxehcir0-src
+    vbox_vboxehcir0-src_INST = bin/src/vbox_vboxehcir0/
+    vbox_vboxehcir0-src_SYMLINKS = \
+        SUPWrapperMod-linux.c=>../common/SUPWrapperMod-linux.c \
+        Makefile-wrapper.gmk=>../common/Makefile-wrapper.gmk
+    vbox_vboxehcir0-src_SOURCES = \
+        $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/Makefile-vbox_vboxehcir0.gmk=>Makefile \
+        $(VBoxEhciR0_0_OUTDIR)/VBoxEhciR0.r0=>VBoxEhciR0.r0 \
+        $(VBoxEhciR0_0_OUTDIR)/VBoxEhciR0.debug=>VBoxEhciR0.debug
+   endif
   endif
 
@@ -1580 +1592 @@
   $(call VBOX_SET_VER_INFO_DLL,VBoxNvmeR3,PUEL Extension Pack - NVMe Device)
 
-  $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VBoxNvmeR0
-  VBoxNvmeR0_TEMPLATE = VBoxR0ExtPackPuel
-  VBoxNvmeR0_SOURCES  = \
-        Storage/DevNVMe.cpp
-  $(call VBOX_SET_VER_INFO_R0,VBoxNvmeR0,PUEL Extension Pack - NVMe Device$(COMMA) ring-0)
-  ifdef VBOX_WITH_KMOD_WRAPPED_R0_MODS # Wrapper kmod for VBoxEhciR0.r0
-   INSTALLS.linux += vbox_vboxnvmer0-src
-   vbox_vboxnvmer0-src_INST = bin/src/vbox_vboxnvmer0/
-   vbox_vboxnvmer0-src_SYMLINKS = \
-        SUPWrapperMod-linux.c=>../common/SUPWrapperMod-linux.c \
-        Makefile-wrapper.gmk=>../common/Makefile-wrapper.gmk
-   vbox_vboxnvmer0-src_SOURCES = \
-        $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/Makefile-vbox_vboxnvmer0.gmk=>Makefile \
-        $(VBoxNvmeR0_0_OUTDIR)/VBoxNvmeR0.r0=>VBoxNvmeR0.r0 \
-        $(VBoxNvmeR0_0_OUTDIR)/VBoxNvmeR0.debug=>VBoxNvmeR0.debug
+  ifdef VBOX_WITH_R0_MODULES
+   ifdef VBOX_WITH_VBOXR0_AS_DLL
+    DLLS    += VBoxNvmeR0
+   else
+    SYSMODS += VBoxNvmeR0
+   endif
+   VBoxNvmeR0_TEMPLATE = VBoxR0ExtPackPuel
+   VBoxNvmeR0_SOURCES  = \
+        Storage/DevNVMe.cpp
+   $(call VBOX_SET_VER_INFO_R0,VBoxNvmeR0,PUEL Extension Pack - NVMe Device$(COMMA) ring-0)
+   ifdef VBOX_WITH_KMOD_WRAPPED_R0_MODS # Wrapper kmod for VBoxEhciR0.r0
+    INSTALLS.linux += vbox_vboxnvmer0-src
+    vbox_vboxnvmer0-src_INST = bin/src/vbox_vboxnvmer0/
+    vbox_vboxnvmer0-src_SYMLINKS = \
+        SUPWrapperMod-linux.c=>../common/SUPWrapperMod-linux.c \
+        Makefile-wrapper.gmk=>../common/Makefile-wrapper.gmk
+    vbox_vboxnvmer0-src_SOURCES = \
+        $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/Makefile-vbox_vboxnvmer0.gmk=>Makefile \
+        $(VBoxNvmeR0_0_OUTDIR)/VBoxNvmeR0.r0=>VBoxNvmeR0.r0 \
+        $(VBoxNvmeR0_0_OUTDIR)/VBoxNvmeR0.debug=>VBoxNvmeR0.debug
+   endif
   endif