VirtualBox

Changeset 106844 in vbox for trunk/src/VBox/Additions


Ignore:
Timestamp:
Nov 6, 2024 2:00:42 AM (2 months ago)
Author:
vboxsync
Message:

Add/Nt/Installer: Some quick adjustments to make packing work when targeting win.arm64. jiraref:VBP-1253

Location:
trunk/src/VBox/Additions/WINNT/Installer
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r106438 r106844  
    167167        $(PATH_STAGE_BIN)/additions/VBoxMouse.sys \
    168168        \
    169         $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
    170         $(PATH_STAGE_BIN)/additions/VBoxVideo.sys \
    171         $(PATH_STAGE_BIN)/additions/VBoxDisp.dll \
    172         \
    173169        $(PATH_STAGE_BIN)/additions/VBoxSF.sys \
    174170        $(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll
     171
     172ifneq ($(KBUILD_TARGET_ARCH),arm64) ## @todo win.arm64: Make VBoxVideo build.
     173 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     174        $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
     175        $(PATH_STAGE_BIN)/additions/VBoxVideo.sys \
     176        $(PATH_STAGE_BIN)/additions/VBoxDisp.dll
     177endif
    175178
    176179ifeq ($(KBUILD_TARGET_ARCH),amd64) # 32-bit network provider DLLs for 32-bit apps running on a 64-bit system
    … …  
    188191 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
    189192        $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
    190         $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
    191193        $(PATH_STAGE_BIN)/additions/VBoxGuest.cat \
    192         $(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \
    193         $(PATH_STAGE_BIN)/additions/VBoxMouse.cat \
    194         $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
     194        $(PATH_STAGE_BIN)/additions/VBoxMouse.cat
     195 if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
     196  VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
     197        $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
     198        $(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \
     199        $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
     200 endif
    195201 ifeq ($(KBUILD_TARGET_ARCH),x86)
    196202  VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

    r106321 r106844  
    5858  FILE "$%PATH_OUT%\bin\additions\VBoxDrvInst.exe"
    5959
     60!if $%KBUILD_TARGET_ARCH% != "arm64" ;; @todo win.arm64: Make VBoxVideo and friends build on arm.
    6061  FILE "$%PATH_OUT%\bin\additions\VBoxVideo.inf"
    6162!if $%KBUILD_TARGET_ARCH% == "x86"
    … …  
    6869!endif
    6970!ifdef VBOX_SIGN_ADDITIONS
     71  !if $%KBUILD_TARGET_ARCH% == "arm64"
     72    FILE "$%PATH_OUT%\bin\additions\VBoxVideo.cat"
     73  !else
    7074  ${If} $g_strWinVersion == "10"
    7175    FILE "$%PATH_OUT%\bin\additions\VBoxVideo.cat"
    … …  
    7377    FILE "/oname=VBoxVideo.cat" "$%PATH_OUT%\bin\additions\VBoxVideo-PreW10.cat"
    7478  ${EndIf}
    75 !endif
     79  !endif
     80!endif
     81!endif ; $%KBUILD_TARGET_ARCH% != "arm64"
    7682
    7783FunctionEnd
    … …  
    95101!endif
    96102
     103!if $%KBUILD_TARGET_ARCH% != "arm64" ;; @todo win.arm64: Make VBoxVideo and friends build on arm.
    97104  ; Video driver
    98105  SetOutPath "$0\VBoxVideo"
    … …  
    108115!endif
    109116!ifdef VBOX_SIGN_ADDITIONS
     117  !if $%KBUILD_TARGET_ARCH% == "arm64"
     118    FILE "$%PATH_OUT%\bin\additions\VBoxVideo.cat"
     119  !else
    110120  ${If} $g_strWinVersion == "10"
    111121    FILE "$%PATH_OUT%\bin\additions\VBoxVideo.cat"
    … …  
    113123    FILE "/oname=VBoxVideo.cat" "$%PATH_OUT%\bin\additions\VBoxVideo-PreW10.cat"
    114124  ${EndIf}
     125  !endif
    115126!endif
    116127  FILE "$%PATH_OUT%\bin\additions\VBoxDisp.dll"
     128!endif ; $%KBUILD_TARGET_ARCH% != "arm64"
    117129
    118130!if $%VBOX_WITH_WDDM% == "1"
    … …  
    121133
    122134  !ifdef VBOX_SIGN_ADDITIONS
     135    !if $%KBUILD_TARGET_ARCH% == "arm64"
     136      FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
     137    !else
    123138    ${If} $g_strWinVersion == "10"
    124139      FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
    … …  
    126141      FILE "/oname=VBoxWddm.cat" "$%PATH_OUT%\bin\additions\VBoxWddm-PreW10.cat"
    127142    ${EndIf}
     143    !endif
    128144  !endif
    129145  FILE "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
    … …  
    158174  FILE "$%PATH_OUT%\bin\additions\VBoxMouse.inf"
    159175!ifdef VBOX_SIGN_ADDITIONS
     176  !if $%KBUILD_TARGET_ARCH% == "arm64"
     177    FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
     178  !else
    160179  ${If} $g_strWinVersion == "10"
    161180    FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
    … …  
    163182    FILE "/oname=VBoxMouse.cat" "$%PATH_OUT%\bin\additions\VBoxMouse-PreW10.cat"
    164183  ${EndIf}
     184  !endif
    165185!endif
    166186
    … …  
    183203!endif
    184204!ifdef VBOX_SIGN_ADDITIONS
     205  !if $%KBUILD_TARGET_ARCH% == "arm64"
     206    FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
     207  !else
    185208  ${If} $g_strWinVersion == "10"
    186209    FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
    … …  
    188211    FILE "/oname=VBoxGuest.cat" "$%PATH_OUT%\bin\additions\VBoxGuest-PreW10.cat"
    189212  ${EndIf}
     213  !endif
    190214!endif
    191215  FILE "$%PATH_OUT%\bin\additions\VBoxTray.exe"

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

    r106321 r106844  
    359359  SetOutPath "$INSTDIR"
    360360
     361!if $%KBUILD_TARGET_ARCH% != "arm64" ;; @todo win.arm64: Make VBoxVideo and friends build on arm.
    361362  ; Video driver
    362363  FILE "$%PATH_OUT%\bin\additions\VBoxVideo.sys"
    363364  FILE "$%PATH_OUT%\bin\additions\VBoxDisp.dll"
     365!endif ; $%KBUILD_TARGET_ARCH% != "arm64"
    364366
    365367  ; Mouse driver
    … …  
    367369  FILE "$%PATH_OUT%\bin\additions\VBoxMouse.inf"
    368370!ifdef VBOX_SIGN_ADDITIONS
     371  !if $%KBUILD_TARGET_ARCH% == "arm64"
     372    FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
     373  !else
    369374  ${If} $g_strWinVersion == "10"
    370375    FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
    … …  
    372377    FILE "/oname=VBoxMouse.cat" "$%PATH_OUT%\bin\additions\VBoxMouse-PreW10.cat"
    373378  ${EndIf}
     379  !endif
    374380!endif
    375381
    … …  
    386392!endif
    387393!ifdef VBOX_SIGN_ADDITIONS
     394  !if $%KBUILD_TARGET_ARCH% == "arm64"
     395    FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
     396  !else
    388397  ${If} $g_strWinVersion == "10"
    389398    FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
    … …  
    391400    FILE "/oname=VBoxGuest.cat" "$%PATH_OUT%\bin\additions\VBoxGuest-PreW10.cat"
    392401  ${EndIf}
     402  !endif
    393403!endif
    394404
    … …  
    434444
    435445    !ifdef VBOX_SIGN_ADDITIONS
     446      !if $%KBUILD_TARGET_ARCH% == "arm64"
     447        FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
     448      !else
    436449      ${If} $g_strWinVersion == "10"
    437450        FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
    … …  
    439452        FILE "/oname=VBoxWddm.cat" "$%PATH_OUT%\bin\additions\VBoxWddm-PreW10.cat"
    440453      ${EndIf}
     454      !endif
    441455    !endif
    442456    FILE "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
    … …  
    516530  ${EndIf}
    517531
     532!if $%KBUILD_TARGET_ARCH% != "arm64" ;; @todo win.arm64: Make VBoxVideo and friends build on arm.
    518533  ${If} $g_bNoVideoDrv == "false"
    519534    ${If} $g_bWithWDDM == "true"
    … …  
    527542    ${LogVerbose} "Video driver installation skipped!"
    528543  ${EndIf}
     544!endif ; $%KBUILD_TARGET_ARCH% != "arm64"
    529545
    530546  ;
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