Changeset 108104 in vbox
- Timestamp:
- Feb 6, 2025 4:59:10 PM (13 days ago)
- svn:sync-xref-src-repo-rev:
- 167402
- Location:
- trunk/src/VBox
- Files:
-
- 6 edited
-
HostDrivers/VBoxNetAdp/Makefile.kmk (modified) (1 diff)
-
HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (2 diffs)
-
Installer/win/VBoxMergeApp.wxi (modified) (1 diff)
-
Installer/win/VBoxMergeNetAdp6.wxi (modified) (1 diff)
-
Installer/win/VBoxMergeNetLwf.wxi (modified) (1 diff)
-
Installer/win/VBoxMergeUSB.wxi (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
r106646 r108104 156 156 $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys \ 157 157 $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.cat 158 VBoxNetAdp6-inf_SOURCES.win.x86 += \159 $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.cat=>VBoxNetAdp6-PreW10.cat160 VBoxNetAdp6-inf_SOURCES.win.amd64 += \161 $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.cat=>VBoxNetAdp6-PreW10.cat162 158 163 159 $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys: $$(VBoxNetAdp6_1_TARGET) | $$(dir $$@) -
trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
r107303 r108104 154 154 $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.cat 155 155 # $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwfNobj.dll 156 VBoxNetLwf-inf_SOURCES.win.x86 += \157 $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.cat=>VBoxNetLwf-PreW10.cat158 VBoxNetLwf-inf_SOURCES.win.amd64 += \159 $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.cat=>VBoxNetLwf-PreW10.cat160 156 161 157 $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.sys: $$(VBoxNetLwf_1_TARGET) | $$(dir $$@) … … 354 350 355 351 include $(FILE_KBUILD_SUB_FOOTER) 356 -
trunk/src/VBox/Installer/win/VBoxMergeApp.wxi
r108074 r108104 50 50 <Directory Id="dir_VBoxAppVBoxSup" Name="vboxsup"> 51 51 <?if $(env.VBOX_SIGNING_MODE) != "none" ?> 52 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> 53 <Component Id="cp_VBoxSupCat_PreW10" Guid="673195c2-f315-42e7-ff00-5acbd91ea0bd" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_SUPPORTED)"> 54 <File Id="file_VBoxSup_PreW10.cat" Name="VBoxSup.cat" Source="$(env.PATH_OUT)\bin\VBoxSup-PreW10.cat" /> 55 </Component> 56 <?endif?> 57 <Component Id="cp_VBoxSupCat_W10" Guid="589be90d-0286-4684-503d-a1681f9587bc" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_SUPPORTED)"> 52 <Component Id="cp_VBoxSupCat_W10" Guid="589be90d-0286-4684-503d-a1681f9587bc" Bitness="$(var.Property_Bitness)"> 58 53 <File Id="file_VBoxSup.cat" Name="VBoxSup.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxSup.cat" /> 59 54 </Component> -
trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi
r108074 r108104 27 27 28 28 <?if $(env.VBOX_SIGNING_MODE) != "none" ?> 29 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> 30 <Component Id="cp_NetAdp6DriverCat_PreW10" Guid="40aab6d8-a9ca-41bd-3c5e-bd768d44faa7" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE="NDIS6") AND (NOT VBOX_IS_WINDOWS_SUPPORTED)"> 31 <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. --> 32 <File Id="file_VBoxNetAdp6_PreW10.cat" ShortName="NetAdp61.cat" Name="VBoxNetAdp6.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6-PreW10.cat" /> 33 </Component> 34 <?endif?> 35 <Component Id="cp_NetAdp6DriverCat_W10" Guid="37431619-c0ac-4f6a-029e-6a8ac4cd58ad" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE="NDIS6") AND (VBOX_IS_WINDOWS_SUPPORTED)"> 29 <Component Id="cp_NetAdp6DriverCat_W10" Guid="37431619-c0ac-4f6a-029e-6a8ac4cd58ad" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE="NDIS6")"> 36 30 <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. --> 37 31 <File Id="file_VBoxNetAdp6_W10.cat" ShortName="NetAdp62.cat" Name="VBoxNetAdp6.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxNetAdp6.cat" /> 38 32 </Component> 39 33 <?endif?> 40 41 34 <Component Id="cp_NetAdp6Driver" Guid="945d9537-e60d-4bbf-9422-239739e31092" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE="NDIS6")"> 42 35 <File Id="file_VBoxNetAdp6.sys" Name="VBoxNetAdp6.sys" KeyPath="yes" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxNetAdp6.sys" Checksum="yes" /> -
trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi
r108074 r108104 29 29 30 30 <?if $(env.VBOX_SIGNING_MODE) != "none" ?> 31 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> 32 <Component Id="cp_NetLwfDriverCat_PreW10" Guid="cede9469-b1bc-4194-348f-8799485a6283" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE="NDIS6") AND (NOT VBOX_IS_WINDOWS_SUPPORTED)"> 33 <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. --> 34 <File Id="file_VBoxNetLwf_PreW10.cat" ShortName="NetLwf1.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf-PreW10.cat" /> 35 </Component> 36 <?endif?> 37 <Component Id="cp_NetLwfDriverCat_W10" Guid="0932500d-4d45-4d79-8693-3192528d7cae" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE="NDIS6") AND (VBOX_IS_WINDOWS_SUPPORTED)"> 31 <Component Id="cp_NetLwfDriverCat_W10" Guid="0932500d-4d45-4d79-8693-3192528d7cae" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE="NDIS6")"> 38 32 <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. --> 39 33 <File Id="file_VBoxNetLwf_W10.cat" ShortName="NetLwf2.cat" Name="VBoxNetLwf.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxNetLwf.cat" /> 40 34 </Component> 41 35 <?endif?> 42 43 36 <Component Id="cp_NetLwfDriver" Guid="831b909d-f09a-4281-b6b0-99393fa4769d" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE="NDIS6")"> 44 37 <File Id="file_VBoxNetLwf.sys" Name="VBoxNetLwf.sys" KeyPath="yes" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxNetLwf.sys" Checksum="yes" /> -
trunk/src/VBox/Installer/win/VBoxMergeUSB.wxi
r108074 r108104 28 28 <Directory Id="dir_VBoxUSBFilter" Name="filter"> 29 29 <?if $(env.VBOX_SIGNING_MODE) != "none" ?> 30 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> 31 <Component Id="cp_USBFilterDriverCat_PreW10" Guid="ef18fb4d-4530-40db-2957-de2dc90243ab" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_SUPPORTED)"> 32 <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. --> 33 <File Id="file_VBoxUSBMon_PreW10.cat" ShortName="UsbMon1.cat" Name="VBoxUSBMon.cat" Source="$(env.PATH_OUT)\bin\VBoxUSBMon-PreW10.cat" /> 34 </Component> 35 <?endif?> 36 <Component Id="cp_USBFilterDriverCat_W10" Guid="341ce4ca-d00e-4a43-f4e3-453eacc6b493" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_SUPPORTED)"> 30 <Component Id="cp_USBFilterDriverCat_W10" Guid="341ce4ca-d00e-4a43-f4e3-453eacc6b493" Bitness="$(var.Property_Bitness)"> 37 31 <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. --> 38 32 <File Id="file_VBoxUSBMon_W10.cat" ShortName="UsbMon2.cat" Name="VBoxUSBMon.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxUSBMon.cat" /> … … 47 41 <Directory Id="dir_VBoxUSBDevice" Name="device"> 48 42 <?if $(env.VBOX_SIGNING_MODE) != "none" ?> 49 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> 50 <Component Id="cp_USBDeviceDriverCat_PreW10" Guid="43cc14cb-06e9-46c2-d507-20423150ccbd" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_SUPPORTED)"> 51 <File Id="file_VBoxUSB_PreW10.cat" Name="VBoxUSB.cat" Source="$(env.PATH_OUT)\bin\VBoxUSB-PreW10.cat" /> 52 </Component> 53 <?endif?> 54 <Component Id="cp_USBDeviceDriverCat_W10" Guid="2127015e-7a96-4b8d-6015-b1e51a75b5ba" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_SUPPORTED)"> 43 <Component Id="cp_USBDeviceDriverCat_W10" Guid="2127015e-7a96-4b8d-6015-b1e51a75b5ba" Bitness="$(var.Property_Bitness)"> 55 44 <File Id="file_VBoxUSB_W10.cat" Name="VBoxUSB.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxUSB.cat" /> 56 45 </Component>
Note:
See TracChangeset
for help on using the changeset viewer.
