Changeset 104430 in vbox

Timestamp:

Apr 25, 2024 12:21:00 PM (9 months ago)

Author:

vboxsync

Message:

/Config.kmk,Installer/win/Makefile.kmk: time installer signing; cleanups. bugref:10657

Location:

trunk

Files:

• Config.kmk (modified) (4 diffs)
• src/VBox/Installer/win/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -4322 +4322 @@
   # @param 5  Disables dual signing if non-empty, picking the SHA2 signature (since 2022-07-18).
   # @param 6  non-zero for alternative command separator.  This is used for generating repacking scripts.
+  # @param 7  non-zero for timed execution if possible
   ifndef VBOX_SIGN_FILE_FN
    if $(intersects win all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
     # CCS has lost the ability to do dual signing a while ago, can do SHA256 only
-    VBOX_SIGN_FILE_FN     = $(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1,,-digest_algo SHA2)
+    VBOX_SIGN_FILE_FN     = $(if $(strip $7),$(TIME) ,)$(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1,,-digest_algo SHA2)
    else ifdef VBOX_CERTIFICATE_SHA2_SUBJECT_NAME
     ifdef VBOX_CERTIFICATE_SUBJECT_NAME
-     VBOX_SIGN_FILE_FN     = $(if-expr "$5" == "",$(VBOX_SIGNTOOL_SHA1) \
+     VBOX_SIGN_FILE_FN     = $(if-expr "$5" == "",$(if $(strip $7),$(TIME) ,)$(VBOX_SIGNTOOL_SHA1) \
                 sign /fd sha1 \
                 $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
@@ -4338 +4339 @@
                 $(3) \
                 "$(1)" \
-                $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6))$(VBOX_SIGNTOOL_SHA2) \
+                $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6))$(if $(strip $7),$(TIME) ,)$(VBOX_SIGNTOOL_SHA2) \
         sign $(if-expr "$5" == "",/as,) /fd sha256 \
         $(VBOX_CROSS_CERTIFICATE_SHA2_FILE_ARGS) \
@@ -4349 +4350 @@
         "$(1)"
     else
-     VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL_SHA2) \
+     VBOX_SIGN_FILE_FN     = $(if $(strip $7),$(TIME) ,)$(VBOX_SIGNTOOL_SHA2) \
         sign /fd sha256 \
         $(VBOX_CROSS_CERTIFICATE_SHA2_FILE_ARGS) \
@@ -4361 +4362 @@
     endif
    else
-    VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL) \
+    VBOX_SIGN_FILE_FN     = $(if $(strip $7),$(TIME) ,)$(VBOX_SIGNTOOL) \
         sign /fd $(firstword $(VBOX_TEST_SIGN_ALGORITHM) sha256) \
         $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \

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

@@ -1201 +1201 @@
                 $@ \
                 $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd ) )
-        $(REDIRECT) -C $(@D) -- \
+        $(REDIRECT) -C "$(@D)" -- \
                 $(VBoxStubBld_1_TARGET) -out $@ \
                         -target-$(KBUILD_TARGET_ARCH) $(PACKAGE_NAME_FINAL) \
                         -stub $(PATH_STAGE_BIN)/VBoxStub.exe
         $(VBOX_VCC_EDITBIN) /IntegrityCheck:NO $@
-        $(call VBOX_SIGN_FILE_FN,$@)
+        $(call VBOX_SIGN_FILE_FN,$@,,,,,,timed)
  # Create repack script for this step.
         $(APPEND) -nt "$(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(@F).cmd" \
@@ -1223 +1223 @@
         echo "Repacking HERE"
         cd $(VBOX_WIN_INST_REPACK_DIR)
-        $(RM) -f $(VBOX_WIN_INST_REPACK_DIR)/$(PACKAGE_NAME_LANG)-$(KBUILD_TARGET_ARCH).cab
-        $(RM) -f $(VBOX_WIN_INST_REPACK_DIR)/$(PACKAGE_NAME_LANG)-$(KBUILD_TARGET_ARCH).cab.ddf
-        $(RM) -f $(VBOX_WIN_INST_REPACK_DIR)/PackDriversForSubmission_internal.cmd
-        $(CP) $(PATH_STAGE_BIN)/VBoxSup.sys $(VBOX_WIN_INST_REPACK_DIR)
-        $(VBOX_SIGNTOOL) remove /s /q $(VBOX_WIN_INST_REPACK_DIR)/VBoxSup.sys
-        $(CP) $(PATH_STAGE_BIN)/VBoxNetAdp6.sys $(VBOX_WIN_INST_REPACK_DIR)
-        $(VBOX_SIGNTOOL) remove /s /q $(VBOX_WIN_INST_REPACK_DIR)/VBoxNetAdp6.sys
-        $(CP) $(PATH_STAGE_BIN)/VBoxNetLwf.sys $(VBOX_WIN_INST_REPACK_DIR)
-        $(VBOX_SIGNTOOL) remove /s /q $(VBOX_WIN_INST_REPACK_DIR)/VBoxNetLwf.sys
-        $(CP) $(PATH_STAGE_BIN)/VBoxUSB.sys $(VBOX_WIN_INST_REPACK_DIR)
-        $(VBOX_SIGNTOOL) remove /s /q $(VBOX_WIN_INST_REPACK_DIR)/VBoxUSB.sys
-        $(CP) $(PATH_STAGE_BIN)/VBoxUSBMon.sys $(VBOX_WIN_INST_REPACK_DIR)
-        $(VBOX_SIGNTOOL) remove /s /q $(VBOX_WIN_INST_REPACK_DIR)/VBoxUSBMon.sys
-        $(CP) $(PATH_STAGE_BIN)/VMMR0.r0 $(VBOX_WIN_INST_REPACK_DIR)
-        $(VBOX_SIGNTOOL) remove /s /q $(VBOX_WIN_INST_REPACK_DIR)/VMMR0.r0
-        $(CP) $(PATH_STAGE_BIN)/VBoxDDR0.r0 $(VBOX_WIN_INST_REPACK_DIR)
-        $(VBOX_SIGNTOOL) remove /s /q $(VBOX_WIN_INST_REPACK_DIR)/VBoxDDR0.r0
+        $(RM) -f -- \
+                "$(VBOX_WIN_INST_REPACK_DIR)/$(PACKAGE_NAME_LANG)-$(KBUILD_TARGET_ARCH).cab" \
+                "$(VBOX_WIN_INST_REPACK_DIR)/$(PACKAGE_NAME_LANG)-$(KBUILD_TARGET_ARCH).cab.ddf" \
+                "$(VBOX_WIN_INST_REPACK_DIR)/PackDriversForSubmission_internal.cmd"
+        $(foreach file, VBoxSup.sys VBoxNetAdp6.sys VBoxNetLwf.sys VBoxUSB.sys VBoxUSBMon.sys VMMR0.r0 VBoxDDR0.r0 \
+        ,$(NLTAB)$(CP) -- "$(PATH_STAGE_BIN)/$(file)" "$(VBOX_WIN_INST_REPACK_DIR)/" \
+                 $(NLTAB)$(VBOX_SIGNTOOL) remove /s /q "$(VBOX_WIN_INST_REPACK_DIR)/$(file)" )
         cd $(VBOX_WIN_INST_REPACK_DIR) && ls -la
         $(APPEND) -nt "$(VBOX_WIN_INST_REPACK_DIR)/PackDriversForSubmission_internal.cmd" \
-        "SET KBUILD_BIN_PATH=$(KBUILD_BIN_PATH)" \
-        "call PackDriversForSubmission.cmd -b $(PATH_STAGE_BIN) -a $(KBUILD_TARGET_ARCH) \
+                "SET KBUILD_BIN_PATH=$(KBUILD_BIN_PATH)" \
+                "call PackDriversForSubmission.cmd -b $(PATH_STAGE_BIN) -a $(KBUILD_TARGET_ARCH) \
                 -x -n --no-extpack -o $(VBOX_WIN_INST_REPACK_DIR)/$(PACKAGE_NAME_LANG)-$(KBUILD_TARGET_ARCH).cab"
 
-        cd $(VBOX_WIN_INST_REPACK_DIR) && $(EXEC_X86_WIN32) cmd.exe /c PackDriversForSubmission_internal.cmd
-        cd $(VBOX_WIN_INST_REPACK_DIR) && $(VBOX_RETRY) $(VBOX_WIN_ATTESTATION_SIGNING_EXE) "Oracle VM VirtualBox Base drivers $(KBUILD_TARGET_ARCH) $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)r$(VBOX_SVN_REV)" "$(KBUILD_TARGET_ARCH)" "r$(VBOX_SVN_REV)" "$(PACKAGE_NAME_LANG)-$(KBUILD_TARGET_ARCH).cab"
-
-        $(RM) -f $(VBOX_WIN_INST_REPACK_DIR)/Single-3-Repack_internal.cmd
+        $(TIME_EXT) $(REDIRECT_EXT) -C "$(VBOX_WIN_INST_REPACK_DIR)" -- $(EXEC_X86_WIN32) cmd.exe /c PackDriversForSubmission_internal.cmd
+        $(TIME_EXT) $(REDIRECT_EXT) -C "$(VBOX_WIN_INST_REPACK_DIR)" -- $(VBOX_RETRY) $(VBOX_WIN_ATTESTATION_SIGNING_EXE) "Oracle VM VirtualBox Base drivers $(KBUILD_TARGET_ARCH) $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)r$(VBOX_SVN_REV)" "$(KBUILD_TARGET_ARCH)" "r$(VBOX_SVN_REV)" "$(PACKAGE_NAME_LANG)-$(KBUILD_TARGET_ARCH).cab"
+
+        $(RM) -f -- "$(VBOX_WIN_INST_REPACK_DIR)/Single-3-Repack_internal.cmd"
         $(APPEND) -nt "$(VBOX_WIN_INST_REPACK_DIR)/Single-3-Repack_internal.cmd" \
-        "SET KBUILD_BIN_PATH=$(KBUILD_BIN_PATH)" \
-        "SET KBUILD_DEVTOOLS=$(KBUILD_DEVTOOLS)" \
-        "call Single-3-Repack.cmd --no-extpack --signed "$(PACKAGE_NAME_LANG)-$(KBUILD_TARGET_ARCH).cab.Signed.zip"
-        cd $(VBOX_WIN_INST_REPACK_DIR) && $(EXEC_X86_WIN32) cmd.exe /c Single-3-Repack_internal.cmd
-
-        $(RM) -f $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)
-        $(RM) -f $(PATH_STAGE_BIN)/$(PACKAGE_NAME_LANG).msi
-        $(CP) $(VBOX_WIN_INST_REPACK_DIR)/$(PACKAGE_NAME_MULTIARCH_FINAL) $(PATH_STAGE_BIN)/
-        $(CP) $(VBOX_WIN_INST_REPACK_DIR)/$(PACKAGE_NAME_LANG).msi        $(PATH_STAGE_BIN)/
+                "SET KBUILD_BIN_PATH=$(KBUILD_BIN_PATH)" \
+                "SET KBUILD_DEVTOOLS=$(KBUILD_DEVTOOLS)" \
+                "call Single-3-Repack.cmd --no-extpack --signed "$(PACKAGE_NAME_LANG)-$(KBUILD_TARGET_ARCH).cab.Signed.zip"
+        $(TIME_EXT) $(REDIRECT_EXT) -C "$(VBOX_WIN_INST_REPACK_DIR)" -- $(EXEC_X86_WIN32) cmd.exe /c Single-3-Repack_internal.cmd
+
+        $(RM) -f -- \
+                "$(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)" \
+                "$(PATH_STAGE_BIN)/$(PACKAGE_NAME_LANG).msi"
+        $(CP) -- "$(VBOX_WIN_INST_REPACK_DIR)/$(PACKAGE_NAME_MULTIARCH_FINAL)" "$(PATH_STAGE_BIN)/"
+        $(CP) -- "$(VBOX_WIN_INST_REPACK_DIR)/$(PACKAGE_NAME_LANG).msi"        "$(PATH_STAGE_BIN)/"
  endif
 endif