VirtualBox

Changeset 106986 in vbox for trunk/src/VBox/Installer/win


Ignore:
Timestamp:
Nov 13, 2024 1:12:38 PM (2 months ago)
Author:
vboxsync
Message:

Installer/win: ARM64 adjustments. jiraref:VBP-1442

Location:
trunk/src/VBox/Installer/win
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/win/Makefile.kmk

    r106531 r106986  
    524524        -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
    525525        -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
     526        -E 'VBOX_WITH_ORACLE_QT=$(if $(VBOX_WITH_ORACLE_QT),yes,no)' \
     527        -E 'VBOX_WITH_R0_MODULES=$(if $(VBOX_WITH_R0_MODULES),yes,no)' \
     528        -E 'VBOX_WITH_MINIMAL_R0=$(if $(VBOX_WITH_MINIMAL_R0),yes,no)' \
    526529        -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),yes,no)' \
    527530        -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \
    … …  
    719722                        $(VBOX_WIN_INST_REPACK_DIR)/ $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ )
    720723        $(QUIET)$(RM) -f -- "$$@"  "$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixlib" "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wixlib"
     724## @todo r=bird: Wtf do we duplicate most/all of VBOX_WIN_INST_ENV here?
    721725        $(REDIRECT) \
    722726                -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \
    … …  
    774778                -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
    775779                -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
     780                -E 'VBOX_WITH_ORACLE_QT=$(if $(VBOX_WITH_ORACLE_QT),yes,no)' \
     781                -E 'VBOX_WITH_R0_MODULES=$(if $(VBOX_WITH_R0_MODULES),yes,no)' \
     782                -E 'VBOX_WITH_MINIMAL_R0=$(if $(VBOX_WITH_MINIMAL_R0),yes,no)' \
    776783                -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),yes,no)' \
    777784                -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \
    … …  
    836843                | $$$$(dir $$$$@) $(VBOX_WIN_INST_REPACK_DIR)/
    837844        $(QUIET)$(RM) -f -- "$$@" "$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix"
     845## @todo r=bird: Wtf do we duplicate most/all of VBOX_WIN_INST_ENV here?  This stuff is surely out of sync.
    838846        $(REDIRECT) \
    839847                -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \

  • trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

    r106321 r106986  
    4949    <Directory Id="dir_VBoxAppDrivers" Name="drivers">
    5050        <Directory Id="dir_VBoxAppVBoxSup" Name="vboxsup">
    51 <?if $(env.VBOX_SIGNING_MODE) != none ?>
     51<?if $(env.VBOX_SIGNING_MODE) != "none" ?>
     52 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    5253            <Component Id="cp_VBoxSupCat_PreW10" Guid="673195c2-f315-42e7-ff00-5acbd91ea0bd" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_10)">
    5354                <File Id="file_VBoxSup_PreW10.cat" Name="VBoxSup.cat" Source="$(env.PATH_OUT)\bin\VBoxSup-PreW10.cat" />
    5455            </Component>
     56 <?endif?>
    5557            <Component Id="cp_VBoxSupCat_W10" Guid="589be90d-0286-4684-503d-a1681f9587bc" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_10)">
    5658                <File Id="file_VBoxSup.cat" Name="VBoxSup.cat" Source="$(env.PATH_OUT)\bin\VBoxSup.cat" />
    … …  
    127129    </Component>
    128130
     131    <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    129132    <Component Id="cp_ProxyStubLegacy" Guid="97F12055-5B6D-481C-E8CD-F41D8C733280" Bitness="$(var.Property_Bitness)" Condition="(VersionNT &lt; 601)">
    130133        <!-- Only install this proxy stub DLL pre-Windows 7 (AMD64: legacy NDR stuff; Both: No ObjectStublessClientXX). -->
    131 
    132134        <File Id="file_VBoxProxyStubLegacy" Name="VBoxProxyStubLegacy.dll" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxProxyStubLegacy.dll">
    133135            <Class Id="$(env.VBOX_MIDL_PROXY_CLSID)" Context="InprocServer32" Description="PSFactoryBuffer" ThreadingModel="both" />
    … …  
    135137        <?include $(env.PATH_TARGET)\VirtualBox_TypeLib.wxi ?>
    136138    </Component>
     139    <?endif?>
    137140
    138141<?endif?>
    … …  
    243246        <File Id="file_VBoxDDU.dll" Name="VBoxDDU.dll" Source="$(env.PATH_OUT)\bin\VBoxDDU.dll" />
    244247        <File Id="file_VBoxRT.dll" Name="VBoxRT.dll" Source="$(env.PATH_OUT)\bin\VBoxRT.dll" />
     248<?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
    245249        <File Id="file_VBoxSupLib.dll" Name="VBoxSupLib.dll" Source="$(env.PATH_OUT)\bin\VBoxSupLib.dll" />
     250<?endif?>
    246251        <File Id="file_VBoxVMM.dll" Name="VBoxVMM.dll" Source="$(env.PATH_OUT)\bin\VBoxVMM.dll" />
    247252<?if $(env.VBOX_WITH_LIBSSH) = "yes" ?>
    … …  
    276281        <File Id="file_VBoxDDRC.rc" Name="VBoxDDRC.rc" Source="$(env.PATH_OUT)\bin\VBoxDDRC.rc" />
    277282<?endif?>
    278 
     283<?if $(env.VBOX_WITH_R0_MODULES) = "yes" ?>
    279284        <File Id="file_VMMR0.r0" Name="VMMR0.r0" Source="$(env.PATH_OUT)\bin\VMMR0.r0" />
     285    <?if $(env.VBOX_WITH_MINIMAL_R0) = "no" ?>
    280286        <File Id="file_VBoxDDR0.r0" Name="VBoxDDR0.r0" Source="$(env.PATH_OUT)\bin\VBoxDDR0.r0" />
     287    <?endif?>
     288<?endif?>
    281289
    282290<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    … …  
    288296        <File Id="file_UICommon.dll" Name="UICommon.dll" Source="$(env.PATH_OUT)\bin\UICommon.dll">
    289297        </File>
    290         <?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
    291             <File Id="file_VirtualBoxVM.dll" Name="VirtualBoxVM.dll" Source="$(env.PATH_OUT)\bin\VirtualBoxVM.dll">
    292             </File>
    293         <?endif?>
     298    <?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
     299        <File Id="file_VirtualBoxVM.dll" Name="VirtualBoxVM.dll" Source="$(env.PATH_OUT)\bin\VirtualBoxVM.dll">
     300        </File>
     301    <?endif?>
     302    <?if $(env.VBOX_WITH_ORACLE_QT) = "yes" ?>
    294303        <File Id="file_Qt6Core$(var.VBOX_QT_INFIX).dll" Name="Qt6Core$(var.VBOX_QT_INFIX).dll" Source="$(env.PATH_OUT)\bin\Qt6Core$(var.VBOX_QT_INFIX).dll" />
    295304        <File Id="file_Qt6Gui$(var.VBOX_QT_INFIX).dll" Name="Qt6Gui$(var.VBOX_QT_INFIX).dll" Source="$(env.PATH_OUT)\bin\Qt6Gui$(var.VBOX_QT_INFIX).dll" />
    … …  
    298307        <File Id="file_Qt6StateMachine$(var.VBOX_QT_INFIX).dll" Name="Qt6StateMachine$(var.VBOX_QT_INFIX).dll" Source="$(env.PATH_OUT)\bin\Qt6StateMachine$(var.VBOX_QT_INFIX).dll" />
    299308        <File Id="file_Qt6Help$(var.VBOX_QT_INFIX).dll" Name="Qt6Help$(var.VBOX_QT_INFIX).dll" Source="$(env.PATH_OUT)\bin\Qt6Help$(var.VBOX_QT_INFIX).dll" />
     309        <!-- @todo r=bird: why file_vSql* and not file_Qt6Sql* like the 6 files above? -->
    300310        <File Id="file_vSql$(var.VBOX_QT_INFIX).dll" Name="Qt6Sql$(var.VBOX_QT_INFIX).dll" Source="$(env.PATH_OUT)\bin\Qt6Sql$(var.VBOX_QT_INFIX).dll" />
     311    <?endif?>
    301312        <File Id="file_VirtualBox.VisualElementsManifest.xml" Name="VirtualBox.VisualElementsManifest.xml" Source="$(env.PATH_OUT)\bin\VirtualBox.VisualElementsManifest.xml" />
    302313        <File Id="file_VirtualBox_70px.png" Name="VirtualBox_70px.png" Source="$(env.PATH_OUT)\bin\VirtualBox_70px.png" />
    … …  
    317328        <File Id="file_VBoxEFI32.fd" Name="VBoxEFI32.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFI32.fd" />
    318329        <File Id="file_VBoxEFI64.fd" Name="VBoxEFI64.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFI64.fd" />
     330    <?if $(env.KBUILD_TARGET_ARCH) = "arm64" ?>
     331        <File Id="file_VBoxEFIAArch32.fd" Name="VBoxEFIAArch32.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFIAArch32.fd" />
     332        <File Id="file_VBoxEFIAArch64.fd" Name="VBoxEFIAArch64.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFIAArch64.fd" />
     333    <?endif?>
    319334<?endif?>
    320335        <!-- VBox guest additions -->
    … …  
    331346    </Component> <!-- MainBinaries -->
    332347
    333 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
     348<?if $(env.VBOX_WITH_QTGUI) = "yes" And $(env.VBOX_WITH_ORACLE_QT) = "yes" ?>
    334349    <!-- Qt platforms plugins -->
    335350    <Directory Id="dir_VBoxAppPlatforms" Name="platforms">

  • trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi

    r106061 r106986  
    2626<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
    2727
    28 <?if $(env.VBOX_SIGNING_MODE) != none ?>
    29     <Component Id="cp_NetAdp6DriverCat_PreW10" Guid="40aab6d8-a9ca-41bd-3c5e-bd768d44faa7" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_10)">
    30         <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    31         <File Id="file_VBoxNetAdp6_PreW10.cat" ShortName="NetAdp61.cat" Name="VBoxNetAdp6.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6-PreW10.cat" />
    32     </Component>
     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=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_10)">
     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?>
    3335    <Component Id="cp_NetAdp6DriverCat_W10" Guid="37431619-c0ac-4f6a-029e-6a8ac4cd58ad" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (VBOX_IS_WINDOWS_10)">
    3436        <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->

  • trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi

    r106061 r106986  
    2828<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    2929
    30 <?if $(env.VBOX_SIGNING_MODE) != none ?>
    31     <Component Id="cp_NetLwfDriverCat_PreW10" Guid="cede9469-b1bc-4194-348f-8799485a6283" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_10)">
    32         <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    33         <File Id="file_VBoxNetLwf_PreW10.cat" ShortName="NetLwf1.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf-PreW10.cat" />
    34     </Component>
    35     <Component Id="cp_NetLwfDriverCat_W10" Guid="0932500d-4d45-4d79-8693-3192528d7cae" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (VBOX_IS_WINDOWS_10)">
    36         <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    37         <File Id="file_VBoxNetLwf_W10.cat" ShortName="NetLwf2.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf.cat" />
    38     </Component>
    39 <?endif?>
     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=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_10)">
     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=&quot;NDIS6&quot;) AND (VBOX_IS_WINDOWS_10)">
     38            <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
     39            <File Id="file_VBoxNetLwf_W10.cat" ShortName="NetLwf2.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf.cat" />
     40        </Component>
     41    <?endif?>
    4042
    4143    <Component Id="cp_NetLwfDriver" Guid="831b909d-f09a-4281-b6b0-99393fa4769d" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;)">

  • trunk/src/VBox/Installer/win/VBoxMergeUSB.wxi

    r106321 r106986  
    2727
    2828    <Directory Id="dir_VBoxUSBFilter" Name="filter">
    29 <?if $(env.VBOX_SIGNING_MODE) != none ?>
     29<?if $(env.VBOX_SIGNING_MODE) != "none" ?>
     30    <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    3031        <Component Id="cp_USBFilterDriverCat_PreW10" Guid="ef18fb4d-4530-40db-2957-de2dc90243ab" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_10)">
    3132            <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3233            <File Id="file_VBoxUSBMon_PreW10.cat" ShortName="UsbMon1.cat" Name="VBoxUSBMon.cat" Source="$(env.PATH_OUT)\bin\VBoxUSBMon-PreW10.cat" />
    3334        </Component>
     35    <?endif?>
    3436        <Component Id="cp_USBFilterDriverCat_W10" Guid="341ce4ca-d00e-4a43-f4e3-453eacc6b493" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_10)">
    3537            <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    … …  
    4446
    4547    <Directory Id="dir_VBoxUSBDevice" Name="device">
    46 <?if $(env.VBOX_SIGNING_MODE) != none ?>
     48<?if $(env.VBOX_SIGNING_MODE) != "none" ?>
     49    <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    4750        <Component Id="cp_USBDeviceDriverCat_PreW10" Guid="43cc14cb-06e9-46c2-d507-20423150ccbd" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_10)">
    48 
    4951            <File Id="file_VBoxUSB_PreW10.cat" Name="VBoxUSB.cat" Source="$(env.PATH_OUT)\bin\VBoxUSB-PreW10.cat" />
    5052        </Component>
     53    <?endif?>
    5154        <Component Id="cp_USBDeviceDriverCat_W10" Guid="2127015e-7a96-4b8d-6015-b1e51a75b5ba" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_10)">
    52 
    5355            <File Id="file_VBoxUSB_W10.cat" Name="VBoxUSB.cat" Source="$(env.PATH_OUT)\bin\VBoxUSB.cat" />
    5456        </Component>

  • trunk/src/VBox/Installer/win/VirtualBox.wxs

    r106061 r106986  
    3737        <?define Property_VBoxMergeUSB = "$(env.VBOX_WIN_INST_MERGE_USB)" ?>
    3838    <?endif?>
    39     <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     39    <?if $(env.VBOX_WITH_NETFLT) = "yes" And $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    4040        <?define Property_VBoxMergeNetworkFlt = "$(env.VBOX_WIN_INST_MERGE_NETFLT)" ?>
    4141    <?endif?>
    4242    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    43         <?define Property_VBoxMergeNetworkAdp  = "$(env.VBOX_WIN_INST_MERGE_NETADP)" ?>
     43        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
     44            <?define Property_VBoxMergeNetworkAdp  = "$(env.VBOX_WIN_INST_MERGE_NETADP)" ?>
     45        <?endif?>
    4446        <?define Property_VBoxMergeNetworkAdp6 = "$(env.VBOX_WIN_INST_MERGE_NETADP6)" ?>
    4547    <?endif?>
    … …  
    238240    <?endif?>
    239241    <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    240         <?include VBoxMergeNetFltCA.wxi ?>
     242        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
     243            <?include VBoxMergeNetFltCA.wxi ?>
     244        <?endif?>
    241245        <?include VBoxMergeNetLwfCA.wxi ?>
    242246    <?endif?>
    243     <?include VBoxMergeNetAdpCA.wxi ?>
    244     <?include VBoxMergeNetAdp6CA.wxi ?>
     247    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
     248        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
     249            <?include VBoxMergeNetAdpCA.wxi ?>
     250        <?endif?>
     251        <?include VBoxMergeNetAdp6CA.wxi ?>
     252    <?endif?>
    245253    <?include VBoxMergeUSBCA.wxi ?>
    246254    <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
    … …  
    295303    <?if $(env.VBOX_WITH_MIDL_PROXY_STUB) = "yes" ?>
    296304        <ComponentRef Id="cp_ProxyStub" />
    297         <ComponentRef Id="cp_ProxyStubLegacy" />
     305        <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
     306            <ComponentRef Id="cp_ProxyStubLegacy" />
     307        <?endif?>
    298308    <?endif?>
    299309    <?if $(env.VBOX_WITH_DTRACE) = "yes" ?>
    … …  
    305315    <?endif?>
    306316    <ComponentRef Id="cp_MainBinaries" />
    307     <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
     317    <?if $(env.VBOX_WITH_QTGUI) = "yes" and $(env.VBOX_WITH_ORACLE_QT) = "yes" ?>
    308318        <ComponentRef Id="cp_QtPlatforms" />
    309319        <ComponentRef Id="cp_QtSqldrivers" />
    … …  
    324334    <ComponentRef Id="cp_VBoxCAPI" />
    325335    <?if $(env.VBOX_SIGNING_MODE) != none ?>
    326         <ComponentRef Id="cp_VBoxSupCat_PreW10" />
     336        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
     337            <ComponentRef Id="cp_VBoxSupCat_PreW10" />
     338        <?endif?>
    327339        <ComponentRef Id="cp_VBoxSupCat_W10" />
    328340    <?endif?>
    … …  
    336348    <?else?>
    337349        <?if $(env.VBOX_SIGNING_MODE) != none ?>
    338             <ComponentRef Id="cp_USBFilterDriverCat_PreW10" />
     350            <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
     351                <ComponentRef Id="cp_USBFilterDriverCat_PreW10" />
     352            <?endif?>
    339353            <ComponentRef Id="cp_USBFilterDriverCat_W10" />
    340354        <?endif?>
    341355            <ComponentRef Id="cp_USBFilterDriver" />
    342356        <?if $(env.VBOX_SIGNING_MODE) != none ?>
    343             <ComponentRef Id="cp_USBDeviceDriverCat_PreW10" />
     357            <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
     358                <ComponentRef Id="cp_USBDeviceDriverCat_PreW10" />
     359            <?endif?>
    344360            <ComponentRef Id="cp_USBDeviceDriverCat_W10" />
    345361        <?endif?>
    … …  
    353369            <Feature Id="VBoxNetworkFlt" Title="VirtualBox Bridged Networking" Level="1" Description="!(loc.VB_NetFltDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no">
    354370    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     371        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    355372                <MergeRef Id="msm_VBoxNetworkFlt" />
     373        <?endif?>
    356374                <MergeRef Id="msm_VBoxNetworkLwf" />
    357375    <?else?>
     376        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    358377                <ComponentRef Id="cp_NetFltDriver" />
     378        <?endif?>
    359379        <?if $(env.VBOX_SIGNING_MODE) != none ?>
     380            <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    360381                <ComponentRef Id="cp_NetLwfDriverCat_PreW10" />
     382            <?endif?>
    361383                <ComponentRef Id="cp_NetLwfDriverCat_W10" />
    362384        <?endif?>
    … …  
    366388            <Feature Id="VBoxNetworkAdp" Title="VirtualBox Host-Only Networking" Level="1" Description="!(loc.VB_NetAdpDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no">
    367389    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     390        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    368391                <MergeRef Id="msm_VBoxNetworkAdp" />
     392        <?endif?>
    369393                <MergeRef Id="msm_VBoxNetworkAdp6" />
    370394    <?else?>
     395        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    371396                <ComponentRef Id="cp_NetAdpDriver" />
     397        <?endif?>
    372398        <?if $(env.VBOX_SIGNING_MODE) != none ?>
     399            <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    373400                <ComponentRef Id="cp_NetAdp6DriverCat_PreW10" />
     401            <?endif?>
    374402                <ComponentRef Id="cp_NetAdp6DriverCat_W10" />
    375403        <?endif?>
    … …  
    453481
    454482<?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
    455         <?include VBoxMergeAppSeq.wxi ?>
    456         <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
    457             <?include VBoxMergeCOM32On64Seq.wxi ?>
    458         <?endif?>
    459         <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     483    <?include VBoxMergeAppSeq.wxi ?>
     484    <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
     485        <?include VBoxMergeCOM32On64Seq.wxi ?>
     486    <?endif?>
     487    <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     488        <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    460489            <?include VBoxMergeNetFltSeq.wxi ?>
    461             <?include VBoxMergeNetLwfSeq.wxi ?>
    462         <?endif?>
    463         <?include VBoxMergeNetAdpSeq.wxi ?>
     490        <?endif?>
     491        <?include VBoxMergeNetLwfSeq.wxi ?>
     492    <?endif?>
     493    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
     494        <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
     495            <?include VBoxMergeNetAdpSeq.wxi ?>
     496        <?endif?>
    464497        <?include VBoxMergeNetAdp6Seq.wxi ?>
    465         <?include VBoxMergeUSBSeq.wxi ?>
    466         <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
    467             <?include VBoxMergePythonSeq.wxi ?>
    468         <?endif?>
     498    <?endif?>
     499    <?include VBoxMergeUSBSeq.wxi ?>
     500    <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
     501        <?include VBoxMergePythonSeq.wxi ?>
     502    <?endif?>
    469503<?endif?>
    470504
    … …  
    526560<?endif?>
    527561                    <Directory Id="dir_Network" Name="network">
    528 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     562<?if $(env.VBOX_WITH_NETFLT) = "yes" And $(env.KBUILD_TARGET_ARCH) = "amd64" ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    529563                        <Directory Id="dir_NetFlt" Name="netflt">
    530564    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    … …  
    539573                        </Directory>
    540574<?endif?>
    541 <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
     575<?if $(env.VBOX_WITH_NETADP) = "yes" and $(env.KBUILD_TARGET_ARCH) = "amd64" ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    542576                        <Directory Id="dir_NetAdp" Name="netadp">
    543577    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette