VirtualBox

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


Ignore:
Timestamp:
Mar 10, 2022 7:29:09 PM (3 years ago)
Author:
vboxsync
Message:

Additions: Windows: Use the same approach as with the host driver for .cat files, i.e. create 2 copies, one for Windows versions before 10, and one for 10 and later (which in UEFI Secure Boot mode modified the trusted root list, requiring Attestation Signing). The NSIS installer will deliver the appropriate file.

Location:
trunk/src/VBox/Additions
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r93430 r94160  
    9797 VBoxGuest-inf_MODE = a+r,u+w
    9898 VBoxGuest-inf_SOURCES = \
    99         $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf \
    100         $(if-expr defined(VBOX_SIGN_ADDITIONS),$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat,) \
     99        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf
     100 VBoxGuest-inf_CLEAN = $(VBoxGuest-inf_SOURCES)
     101 VBoxGuest-inf_BLDDIRS = $(PATH_TARGET)/VBoxGuestCat.dir
     102
     103 $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf: $(PATH_SUB_CURRENT)/common/VBoxGuest/win/VBoxGuest.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
     104        $(call MSG_GENERATE,VBoxGuest-inf,$@,$<)
     105        $(call VBOX_EDIT_INF_FN,$<,$@)
     106
     107if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
     108  VBoxGuest-inf_SOURCES += \
     109        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat \
     110        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat=>VBoxGuest-PreW10.cat \
    101111        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
    102112        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
    103113        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe
    104  VBoxGuest-inf_CLEAN = $(VBoxGuest-inf_SOURCES)
    105  VBoxGuest-inf_BLDDIRS = \
    106         $(PATH_TARGET)/VBoxGuestCat.dir
    107 
    108  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf: $(PATH_SUB_CURRENT)/common/VBoxGuest/win/VBoxGuest.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    109         $(call MSG_GENERATE,VBoxGuest-inf,$@,$<)
    110         $(call VBOX_EDIT_INF_FN,$<,$@)
    111 
    112  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys:   $$(VBoxGuest_1_TARGET) | $$(dir $$@)
     114
     115  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys:   $$(VBoxGuest_1_TARGET) | $$(dir $$@)
    113116        $(INSTALL) -m 644 $< $(@D)
    114117
    115  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe: $$(VBoxControl_1_TARGET) | $$(dir $$@)
     118  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe: $$(VBoxControl_1_TARGET) | $$(dir $$@)
    116119        $(INSTALL) -m 755 $< $(@D)
    117120
    118  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe:    $$(VBoxTray_1_TARGET) | $$(dir $$@)
     121  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe:    $$(VBoxTray_1_TARGET) | $$(dir $$@)
    119122        $(INSTALL) -m 755 $< $(@D)
    120123
    121  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat: \
     124  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat: \
    122125                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf \
    123126                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
    … …  
    126129        $(call MSG_TOOL,Inf2Cat,VBoxGuest-inf,$@,$<)
    127130        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
     131 endif # signing
    128132endif # KBUILD_TARGET == win
    129133

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk

    r93322 r94160  
    3333VBoxVideo-inf_SOURCES = \
    3434        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf
    35 ifdef VBOX_SIGN_ADDITIONS
    36  VBoxVideo-inf_SOURCES += \
    37         $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
    38         $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll \
    39         $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat
    40 endif
    4135VBoxVideo-inf_CLEAN = $(VBoxVideo-inf_SOURCES)
    42 VBoxVideo-inf_BLDDIRS = \
    43         $(PATH_TARGET)/VBoxVideoCat.dir
     36VBoxVideo-inf_BLDDIRS = $(PATH_TARGET)/VBoxVideoCat.dir
    4437
    4538$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf: $(PATH_SUB_CURRENT)/mp/xpdm/VBoxVideo.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    4639        $(call MSG_GENERATE,VBoxVideo-inf,$@,$<)
    4740        $(call VBOX_EDIT_INF_FN,$<,$@)
     41
     42if defined(VBOX_SIGN_ADDITIONS) && defined(VBOX_SIGN_ADDITIONS)
     43 VBoxVideo-inf_SOURCES += \
     44        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat \
     45        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat=>VBoxVideo-PreW10.cat \
     46        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
     47        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll
    4848
    4949$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@)
    … …  
    5353        $(INSTALL) -m 644 $< $(@D)
    5454
    55 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat: \
    56                 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf \
    57                 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
    58                 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll
     55 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat: \
     56                $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf \
     57                $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
     58                $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll
    5959        $(call MSG_TOOL,Inf2Cat,VBoxVideo-inf,$@,$<)
    6060        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
     61endif # signing
    6162
    6263ifdef VBOX_WITH_WDDM
    … …  
    7374 VBoxWddm-inf_SOURCES = \
    7475        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf
    75  ifdef VBOX_SIGN_ADDITIONS
     76 VBoxWddm-inf_CLEAN = $(VBoxWddm-inf_SOURCES)
     77 VBoxWddm-inf_CLEAN.amd64 = $(VBoxWddm-inf_SOURCES.amd64)
     78 VBoxWddm-inf_BLDDIRS = $(PATH_TARGET)/VBoxWddmCat.dir
     79
     80 VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
     81 VBOXWDDM_EDIT_INF_MESA3D_FN_ARG = $(if $(VBOX_WITH_MESA3D),-e 's/^;mesa3d  *//', -e '/^;mesa3d /d')
     82
     83 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf: \
     84                $(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
     85        $(call MSG_GENERATE,VBoxWddm-inf,$@,$<)
     86        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG))
     87
     88 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
    7689  VBoxWddm-inf_SOURCES += \
    77         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys \
    78         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat
     90        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat \
     91        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat=>VBoxWddm-PreW10.cat \
     92        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys
    7993
    8094  ifdef VBOXWDDM_WITH_DISPD3D
    … …  
    98112  endif
    99113
    100  endif # VBOX_SIGN_ADDITIONS
    101 
    102  VBoxWddm-inf_CLEAN = $(VBoxWddm-inf_SOURCES)
    103  VBoxWddm-inf_CLEAN.amd64 = $(VBoxWddm-inf_SOURCES.amd64)
    104  VBoxWddm-inf_BLDDIRS = \
    105         $(PATH_TARGET)/VBoxWddmCat.dir
    106 
    107  VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
    108  VBOXWDDM_EDIT_INF_MESA3D_FN_ARG = $(if $(VBOX_WITH_MESA3D),-e 's/^;mesa3d  *//', -e '/^;mesa3d /d')
    109 
    110  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf: \
    111                 $(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    112         $(call MSG_GENERATE,VBoxWddm-inf,$@,$<)
    113         $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG))
    114 
    115  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys: $$(VBoxWddm_1_TARGET) | $$(dir $$@)
     114  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys: $$(VBoxWddm_1_TARGET) | $$(dir $$@)
    116115        $(INSTALL) -m 644 $< $(@D)
    117116
    118  ifdef VBOXWDDM_WITH_DISPD3D
    119   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
     117  ifdef VBOXWDDM_WITH_DISPD3D
     118   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
    120119        $(INSTALL) -m 644 $< $(@D)
    121120
    122   ifeq ($(KBUILD_TARGET_ARCH),amd64)
    123    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
     121   ifeq ($(KBUILD_TARGET_ARCH),amd64)
     122    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
    124123        $(INSTALL) -m 644 $< $(@D)
    125   endif
    126  endif # VBOXWDDM_WITH_DISPD3D
     124   endif
     125  endif # VBOXWDDM_WITH_DISPD3D
    127126
    128  ifdef VBOX_WITH_MESA3D
    129   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll: $$(VBoxNine_1_TARGET) | $$(dir $$@)
    130         $(INSTALL) -m 644 "$<" "$(@D)"
    131   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll: $$(VBoxSVGA_1_TARGET) | $$(dir $$@)
    132         $(INSTALL) -m 644 "$<" "$(@D)"
    133   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll: $$(VBoxICD_1_TARGET) | $$(dir $$@)
    134         $(INSTALL) -m 644 "$<" "$(@D)"
    135   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll: $$(VBoxGL_1_TARGET) | $$(dir $$@)
     127  ifdef VBOX_WITH_MESA3D
     128   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll: $$(VBoxNine_1_TARGET) | $$(dir $$@)
    136129        $(INSTALL) -m 644 "$<" "$(@D)"
    137130
    138   ifeq ($(KBUILD_TARGET_ARCH),amd64)
    139    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll: $$(VBoxNine-x86_1_TARGET) | $$(dir $$@)
     131   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll: $$(VBoxSVGA_1_TARGET) | $$(dir $$@)
     132        $(INSTALL) -m 644 "$<" "$(@D)"
     133
     134   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll: $$(VBoxICD_1_TARGET) | $$(dir $$@)
     135        $(INSTALL) -m 644 "$<" "$(@D)"
     136
     137   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll: $$(VBoxGL_1_TARGET) | $$(dir $$@)
     138        $(INSTALL) -m 644 "$<" "$(@D)"
     139
     140   ifeq ($(KBUILD_TARGET_ARCH),amd64)
     141    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll: $$(VBoxNine-x86_1_TARGET) | $$(dir $$@)
    140142        $(INSTALL) -m 644 $< $(@D)
    141    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll: $$(VBoxSVGA-x86_1_TARGET) | $$(dir $$@)
     143
     144    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll: $$(VBoxSVGA-x86_1_TARGET) | $$(dir $$@)
    142145        $(INSTALL) -m 644 $< $(@D)
    143    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD-x86.dll: $$(VBoxICD-x86_1_TARGET) | $$(dir $$@)
     146
     147    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD-x86.dll: $$(VBoxICD-x86_1_TARGET) | $$(dir $$@)
    144148        $(INSTALL) -m 644 $< $(@D)
    145    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll: $$(VBoxGL-x86_1_TARGET) | $$(dir $$@)
     149
     150    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll: $$(VBoxGL-x86_1_TARGET) | $$(dir $$@)
    146151        $(INSTALL) -m 644 $< $(@D)
     152   endif
    147153  endif
    148  endif
    149154
    150  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat: \
     155  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat: \
    151156                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf \
    152157                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys \
    … …  
    165170        $(call MSG_TOOL,Inf2Cat,VBoxWddm-inf,$@,$<)
    166171        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    167 
     172 endif # signing
    168173endif # VBOX_WITH_WDDM
    169174

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

    r93634 r94160  
    9797DRIVER_FILES += \
    9898        $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
    99         $(PATH_STAGE_BIN)/additions/VBoxGuest.inf
     99        $(PATH_STAGE_BIN)/additions/VBoxGuest.inf \
     100        $(PATH_STAGE_BIN)/additions/VBoxMouse.inf
    100101ifdef VBOX_SIGN_ADDITIONS
    101102DRIVER_FILES += \
    102103        $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
    103         $(PATH_STAGE_BIN)/additions/VBoxGuest.cat
     104        $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
     105        $(PATH_STAGE_BIN)/additions/VBoxGuest.cat \
     106        $(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \
     107        $(PATH_STAGE_BIN)/additions/VBoxMouse.cat \
     108        $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
    104109endif
    105110ifdef VBOX_WITH_WDDM
    … …  
    117122 ifdef VBOX_SIGN_ADDITIONS
    118123DRIVER_FILES += \
    119         $(PATH_STAGE_BIN)/additions/VBoxWddm.cat
     124        $(PATH_STAGE_BIN)/additions/VBoxWddm.cat \
     125        $(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat
    120126 endif
    121127 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    … …  
    245251                $(if $(VBOX_GA_ATTESTATION_SIGNING),$(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)) \
    246252                $(VBOX_VERSION_STAMP) \
    247                $$(VBoxDrvInst_1_STAGE_TARGET)
     253                $$(VBoxDrvInst_1_STAGE_TARGET)
    248254        $(call MSG_L1,Creating $@, from $<)
    249255ifdef VBOX_GA_ATTESTATION_SIGNING

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

    r93115 r94160  
    3131  FILE "$%PATH_OUT%\bin\additions\VBoxVideo.inf"
    3232!ifdef VBOX_SIGN_ADDITIONS
    33   FILE "$%PATH_OUT%\bin\additions\VBoxVideo.cat"
     33  ${If} $g_strWinVersion == "10"
     34    FILE "$%PATH_OUT%\bin\additions\VBoxVideo.cat"
     35  ${Else}
     36    FILE "/oname=VBoxVideo.cat" "$%PATH_OUT%\bin\additions\VBoxVideo-PreW10.cat"
     37  ${EndIf}
    3438!endif
    3539
    … …  
    5862  FILE "$%PATH_OUT%\bin\additions\VBoxVideo.inf"
    5963!ifdef VBOX_SIGN_ADDITIONS
    60   FILE "$%PATH_OUT%\bin\additions\VBoxVideo.cat"
     64  ${If} $g_strWinVersion == "10"
     65    FILE "$%PATH_OUT%\bin\additions\VBoxVideo.cat"
     66  ${Else}
     67    FILE "/oname=VBoxVideo.cat" "$%PATH_OUT%\bin\additions\VBoxVideo-PreW10.cat"
     68  ${EndIf}
    6169!endif
    6270  FILE "$%PATH_OUT%\bin\additions\VBoxDisp.dll"
    … …  
    6775
    6876  !ifdef VBOX_SIGN_ADDITIONS
    69     FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
     77    ${If} $g_strWinVersion == "10"
     78      FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
     79    ${Else}
     80      FILE "/oname=VBoxWddm.cat" "$%PATH_OUT%\bin\additions\VBoxWddm-PreW10.cat"
     81    ${EndIf}
    7082  !endif
    7183  FILE "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
    … …  
    96108  FILE "$%PATH_OUT%\bin\additions\VBoxMouse.inf"
    97109!ifdef VBOX_SIGN_ADDITIONS
    98   FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
     110  ${If} $g_strWinVersion == "10"
     111    FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
     112  ${Else}
     113    FILE "/oname=VBoxMouse.cat" "$%PATH_OUT%\bin\additions\VBoxMouse-PreW10.cat"
     114  ${EndIf}
    99115!endif
    100116
    … …  
    109125  FILE "$%PATH_OUT%\bin\additions\VBoxGuest.inf"
    110126!ifdef VBOX_SIGN_ADDITIONS
    111   FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
     127  ${If} $g_strWinVersion == "10"
     128    FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
     129  ${Else}
     130    FILE "/oname=VBoxGuest.cat" "$%PATH_OUT%\bin\additions\VBoxGuest-PreW10.cat"
     131  ${EndIf}
    112132!endif
    113133  FILE "$%PATH_OUT%\bin\additions\VBoxTray.exe"

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

    r93262 r94160  
    183183  FILE "$%PATH_OUT%\bin\additions\VBoxMouse.inf"
    184184!ifdef VBOX_SIGN_ADDITIONS
    185   FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
     185  ${If} $g_strWinVersion == "10"
     186    FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
     187  ${Else}
     188    FILE "/oname=VBoxMouse.cat" "$%PATH_OUT%\bin\additions\VBoxMouse-PreW10.cat"
     189  ${EndIf}
    186190!endif
    187191
    … …  
    190194  FILE "$%PATH_OUT%\bin\additions\VBoxGuest.inf"
    191195!ifdef VBOX_SIGN_ADDITIONS
    192   FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
     196  ${If} $g_strWinVersion == "10"
     197    FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
     198  ${Else}
     199    FILE "/oname=VBoxGuest.cat" "$%PATH_OUT%\bin\additions\VBoxGuest-PreW10.cat"
     200  ${EndIf}
    193201!endif
    194202
    … …  
    238246
    239247    !ifdef VBOX_SIGN_ADDITIONS
    240       FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
     248      ${If} $g_strWinVersion == "10"
     249        FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
     250      ${Else}
     251        FILE "/oname=VBoxWddm.cat" "$%PATH_OUT%\bin\additions\VBoxWddm-PreW10.cat"
     252      ${EndIf}
    241253    !endif
    242254    FILE "$%PATH_OUT%\bin\additions\VBoxWddm.sys"

  • trunk/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk

    r93265 r94160  
    5858VBoxMouse-inf_INST = $(INST_ADDITIONS)
    5959VBoxMouse-inf_MODE = a+r,u+w
    60 ifndef VBOX_SIGNING_MODE
    61 VBoxMouse-inf_SOURCES = VBoxMouse.inf
    62 else
    6360VBoxMouse-inf_SOURCES = \
    64         $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf \
    65         $(if-expr defined(VBOX_SIGN_ADDITIONS),$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat,)
    66 VBoxMouse-inf_CLEAN += \
    67         $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat \
    68         $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys \
    6961        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf
     62VBoxMouse-inf_CLEAN = $(VBoxMouse-inf_SOURCES)
    7063VBoxMouse-inf_BLDDIRS = $(PATH_TARGET)/VBoxMouseCat.dir
    7164
    … …  
    7467        $(call VBOX_EDIT_INF_FN,$<,$@)
    7568
    76 $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat: $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf $$(VBoxMouse_1_TARGET)
     69if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
     70 VBoxMouse-inf_SOURCES += \
     71        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys \
     72        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat \
     73        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat=>VBoxMouse-PreW10.cat
     74
     75 $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys: $$(VBoxMouse_1_TARGET) | $$(dir $$@)
     76        $(INSTALL) -m 644 -- "$<" "$(@D)"
     77
     78 $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat: \
     79                $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf \
     80                $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys
    7781        $(call MSG_TOOL,Inf2Cat,VBoxMouse-inf,$@,$<)
    78         $(INSTALL) -m 644 $(VBoxMouse_1_TARGET) $(@D)
    7982        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    8083endif # signing
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