VirtualBox

Ignore:
Timestamp:
Mar 10, 2022 7:29:09 PM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
150415
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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.

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