Changeset 104659 in vbox for trunk/src

Timestamp:

May 16, 2024 9:54:44 AM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163213

Message:

HostDrivers: Only build windows drivers if VBOX_WITH_VBOXDRV is set, bugref:10392

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/Makefile.kmk (modified) (2 diffs)
• Support/win/SUPLib-win.cpp (modified) (2 diffs)
• VBoxNetAdp/Makefile.kmk (modified) (2 diffs)
• VBoxNetFlt/Makefile.kmk (modified) (5 diffs)
• VBoxUSB/win/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -57 +57 @@
 endif
 ifndef VBOX_ONLY_BUILD
- DLLS.win += VBoxSupLib
+ ifn1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.arm64)
+  DLLS.win += VBoxSupLib
+ endif
 endif
 ifdef VBOX_WITH_32_ON_64_MAIN_API
@@ -906 +908 @@
 
 
- ifeq ($(KBUILD_TARGET),win)
-  INSTALLS.win += VBoxSup-inf
-  VBoxSup-inf_TEMPLATE = VBoxR0DrvInfCat
-  VBoxSup-inf_SOURCES = \
-        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.inf
-  VBoxSup-inf_CLEAN = $(VBoxSup-inf_SOURCES)
-  VBoxSup-inf_BLDDIRS = $(PATH_TARGET)/VBoxSupCat.dir
-
-  $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.inf: $(PATH_SUB_CURRENT)/win/VBoxSup.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
-        $(call MSG_GENERATE,VBoxSup-inf,$@,$<)
-        $(call VBOX_EDIT_INF_FN,$<,$@)
-
-  ifdef VBOX_SIGNING_MODE
-   VBoxSup-inf_SOURCES += \
-        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.sys \
-        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.cat \
-        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.cat=>VBoxSup-PreW10.cat
-
-   $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.sys: $$(VBoxDrv_1_TARGET) | $$(dir $$@)
-        $(INSTALL) -m 644 -- "$<" "$(@D)"
-
-   $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.cat: \
-                $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.inf \
-                $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.sys
-        $(call MSG_TOOL,Inf2Cat,VBoxSup-inf,$@,$<)
-        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
-  endif # signing
- endif # win
+ ifdef VBOX_WITH_VBOXDRV
+  ifeq ($(KBUILD_TARGET),win)
+   INSTALLS.win += VBoxSup-inf
+   VBoxSup-inf_TEMPLATE = VBoxR0DrvInfCat
+   VBoxSup-inf_SOURCES = \
+        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.inf
+   VBoxSup-inf_CLEAN = $(VBoxSup-inf_SOURCES)
+   VBoxSup-inf_BLDDIRS = $(PATH_TARGET)/VBoxSupCat.dir
+
+   $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.inf: $(PATH_SUB_CURRENT)/win/VBoxSup.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(call MSG_GENERATE,VBoxSup-inf,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+   ifdef VBOX_SIGNING_MODE
+    VBoxSup-inf_SOURCES += \
+        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.sys \
+        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.cat \
+        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.cat=>VBoxSup-PreW10.cat
+
+    $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.sys: $$(VBoxDrv_1_TARGET) | $$(dir $$@)
+        $(INSTALL) -m 644 -- "$<" "$(@D)"
+
+    $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.cat: \
+                $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.inf \
+                $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.sys
+        $(call MSG_TOOL,Inf2Cat,VBoxSup-inf,$@,$<)
+        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
+   endif # signing
+  endif # win
+ endif # VBOX_WITH_VBOXDRV
 
  #

trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

@@ -869 +869 @@
 {
 # if ARCH_BITS == 64
+#  if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     /*
      * Check that we're in a VM.
@@ -878 +879 @@
     if (!(ASMCpuId_ECX(1) & X86_CPUID_FEATURE_ECX_HVP))
         return false;
+#  endif
 
     /*

trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk

@@ -108 +108 @@
  # VBoxNetAdp6.sys - The VirtualBox Adapter miniport driver.
  #
+ ifdef VBOX_WITH_VBOXDRV
  SYSMODS.win += VBoxNetAdp6
  VBoxNetAdp6_TEMPLATE = VBoxR0Drv
@@ -159 +160 @@
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
 
- endif #  ifdef VBOX_SIGNING_MODE
+  endif #  ifdef VBOX_SIGNING_MODE
+ endif #  ifdef VBOX_WITH_VBOXDRV
 
 endif #ifeq ($(KBUILD_TARGET), win)

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -125 +125 @@
   # Windows extras.
   #
-  INSTALLS.win += VBoxNetFlt-inf
+  ifdef VBOX_WITH_VBOXDRV
+   INSTALLS.win += VBoxNetFlt-inf
+  endif
   VBoxNetFlt-inf_TEMPLATE = VBoxR0DrvInfCat
   VBoxNetFlt-inf_SOURCES = \
@@ -167 +169 @@
   # VBoxNetLwf.sys - The light-weight filter driver for NDIS6.
   #
-  SYSMODS += VBoxNetLwf
+  ifdef VBOX_WITH_VBOXDRV
+   SYSMODS += VBoxNetLwf
+  endif
   VBoxNetLwf_TEMPLATE = VBoxR0Drv
   VBoxNetLwf_INST = $(INST_VBOXNETFLT)
@@ -205 +209 @@
   # VBoxNetLwf installation.
   #
-  INSTALLS.win += VBoxNetLwf-inf
+  ifdef VBOX_WITH_VBOXDRV
+   INSTALLS.win += VBoxNetLwf-inf
+  endif
   VBoxNetLwf-inf_TEMPLATE = VBoxR0DrvInfCat
   VBoxNetLwf-inf_SOURCES = \
@@ -379 +385 @@
   # VBoxNetAdp.sys - The VirtualBox Adapter miniport driver.
   #
-  SYSMODS.win += VBoxNetAdp
+  ifdef VBOX_WITH_VBOXDRV
+   SYSMODS.win += VBoxNetAdp
+  endif
   VBoxNetAdp_TEMPLATE = VBoxR0Drv
   #VBoxNetAdp_INST = $(INST_VBOXNETADP)
@@ -409 +417 @@
 
 
-  INSTALLS.win += VBoxNetAdp-inf
+  ifdef VBOX_WITH_VBOXDRV
+   INSTALLS.win += VBoxNetAdp-inf
+  endif
   VBoxNetAdp-inf_TEMPLATE = VBoxR0DrvInfCat
   VBoxNetAdp-inf_SOURCES = \

trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk

@@ -39 +39 @@
 
 LIBRARIES.win += usbd
-SYSMODS.win   += VBoxUSB VBoxUSBMon
+ifdef VBOX_WITH_VBOXDRV
+ SYSMODS.win   += VBoxUSB VBoxUSBMon
+ INSTALLS.win  += install-infs
+endif
 PROGRAMS.win  += USBInstall USBUninstall USBTest
-INSTALLS.win  += install-infs
 
 #