Changeset 95685 in vbox

Timestamp:

Jul 17, 2022 9:38:52 PM (2 years ago)

Author:

vboxsync

Message:

SUP: Added a dummy build program (bldSUPSignedDummy) for singing certificate extraction, as bldRTSignTool cannot easily sign itself (cyclic dependency). bugref:8691

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/Makefile.kmk (modified) (2 diffs)
• HostDrivers/Support/bldSUPSignedDummy.cpp (added)
• Runtime/tools/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -126 +126 @@
 endif
 
+if  ("$(KBUILD_TARGET)" == "win"    && defined(VBOX_SIGNING_MODE)) \
+ || ("$(KBUILD_TARGET)" == "darwin" && defined(VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION) && defined(VBOX_SIGNING_MODE))
+ BLDPROGS += bldSUPSignedDummy
+ bldSUPSignedDummy_TEMPLATE         = VBoxBldProg
+ bldSUPSignedDummy_SOURCES          = bldSUPSignedDummy.cpp
+ bldSUPSignedDummy_ORDERDEPS.win    = $(VBOX_SIGN_IMAGE_ORDERDEPS)
+ bldSUPSignedDummy_POST_CMDS.win    = $(call VBOX_SIGN_IMAGE_FN,$(out),,2)
+ bldSUPSignedDummy_POST_CMDS.darwin = $(call VBOX_SIGN_MACHO_FN,$(out),org.virtualbox.org.bldtool.$(target))
+endif
+
 $$(VBOX_SUP_WIN_CERTS_FILE): $(MAKEFILE_CURRENT) \
                 $(foreach cert,$(VBOX_SUP_WIN_CERTS),$(VBOX_PATH_SUPR3_CERTIFICATES)/$(lastword $(subst =,$(SPACE) ,$(cert)))) \
                 $(VBOX_BIN2C) \
-                $(if-expr  ("$(KBUILD_TARGET)" == "win" && defined(VBOX_WITH_HARDENING)) \
-                        || ("$(KBUILD_TARGET)" == "darwin" && defined(VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION) && defined(VBOX_SIGNING_MODE)) \
-                ,$(VBOX_RTSIGNTOOL)) \
+                $(if-expr defined(bldSUPSignedDummy_SOURCES),$(VBOX_RTSIGNTOOL) $$(bldSUPSignedDummy_1_TARGET),) \
                 | $$(dir $$@)
         $(QUIET)$(RM) -f -- $@ [email protected]
@@ -143 +151 @@
                 "$@")
 # The build certificate.
-if  ("$(KBUILD_TARGET)" == "win" && defined(VBOX_WITH_HARDENING) && defined(VBOX_SIGNING_MODE)) \
- || ("$(KBUILD_TARGET)" == "darwin" && defined(VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION) && defined(VBOX_SIGNING_MODE))
-        $(VBOX_RTSIGNTOOL) extract-exe-signer-cert --exe $(VBOX_RTSIGNTOOL) --output "[email protected]" --der
+ifdef bldSUPSignedDummy_SOURCES
+        $(VBOX_RTSIGNTOOL) extract-exe-signer-cert --exe "$(bldSUPSignedDummy_1_TARGET)" --output "[email protected]" --der
         $(VBOX_BIN2C) -ascii --append SUPBuildCert "[email protected]" $@
         $(QUIET)$(RM) -f -- [email protected]

trunk/src/VBox/Runtime/tools/Makefile.kmk

@@ -79 +79 @@
   bldRTSignTool_DEFS      := IPRT_IN_BUILD_TOOL
   bldRTSignTool_LIBS.win  := Crypt32.lib NCrypt.lib
-  bldRTSignTool_POST_CMDS.win = $(VBOX_SIGN_IMAGE_CMDS)
-  if defined(VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION) && defined(VBOX_SIGNING_MODE)
-   bldRTSignTool_POST_CMDS.darwin = $(call VBOX_SIGN_MACHO_FN,$(out),org.virtualbox.org.bldtool.$(target))
-  endif
   ifndef VBOX_WITH_BLD_RTSIGNTOOL_SIGNING
    bldRTSignTool_DEFS     += IPRT_SIGNTOOL_NO_SIGNING