Changeset 99173 in vbox for trunk/src

Timestamp:

Mar 24, 2023 1:01:34 PM (23 months ago)

Author:

vboxsync

Message:

GA Makefile: unifiying attestation signing switch name with ExtPack one

File:

• trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk (modified) (5 diffs)

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

@@ -43 +43 @@
 ## @todo VBOX_WIN_ADD_INS_OUT_DIR := $(PATH_TARGET)/Additions/Installer/win
 
-ifdef VBOX_GA_ATTESTATION_SIGNING
+ifdef VBOX_WIN_ATTESTATION_SIGNING
  VBOX_DRIVERS_PACK_NAME := VBoxDrivers-$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)r$(VBOX_SVN_REV)-$(KBUILD_TARGET_ARCH).cab
  VBOX_SIGNED_DRIVERS_ZIP_NAME := $(VBOX_DRIVERS_PACK_NAME).Signed.zip
@@ -314 +314 @@
                 $(VBOX_NSIS_ICON_FILE) \
                 $(if $(VBOX_SIGNING_MODE),$(PATH_TARGET)/uninst.exe) \
-                $(if $(VBOX_GA_ATTESTATION_SIGNING),$(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)) \
+                $(if $(VBOX_WIN_ATTESTATION_SIGNING),$(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)) \
                 $(VBOX_VERSION_STAMP) \
                 $$(VBoxDrvInst_1_STAGE_TARGET)
         $(call MSG_L1,Creating $@, from $<)
-ifdef VBOX_GA_ATTESTATION_SIGNING # Unpack the attestation signed drivers - this is an ugly has 'ing heck hack!
+ifdef VBOX_WIN_ATTESTATION_SIGNING # Unpack the attestation signed drivers - this is an ugly has 'ing heck hack!
         $(TOOL_ZIP_UNPACK) -oj $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME) -d $(PATH_STAGE_BIN)/additions/
 endif
@@ -388 +388 @@
 
 
-if defined(VBOX_GA_ATTESTATION_SIGNING) && defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
+if defined(VBOX_WIN_ATTESTATION_SIGNING) && defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
  #
  # This automagically attestation signs the GA drivers.
@@ -395 +395 @@
                 $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
         $(RM_EXT) -f $(PATH_OUT)/repackadd/*.zip
-        cd $(PATH_OUT)/repackadd && $(VBOX_RETRY) $(VBOX_GA_ATTESTATION_SIGNING_EXE) "Oracle VM VirtualBox GA drivers $(KBUILD_TARGET_ARCH) $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)r$(VBOX_SVN_REV)" "$(KBUILD_TARGET_ARCH)" "r$(VBOX_SVN_REV)" "$(VBOX_DRIVERS_PACK_NAME)"
+        cd $(PATH_OUT)/repackadd && $(VBOX_RETRY) $(VBOX_WIN_ATTESTATION_SIGNING_EXE) "Oracle VM VirtualBox GA drivers $(KBUILD_TARGET_ARCH) $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)r$(VBOX_SVN_REV)" "$(KBUILD_TARGET_ARCH)" "r$(VBOX_SVN_REV)" "$(VBOX_DRIVERS_PACK_NAME)"
 
  #
@@ -410 +410 @@
                 -x -n --no-main --ga -o $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
         $(call VBOX_SIGN_EV_FILE_FN,$@)
-endif # VBOX_GA_ATTESTATION_SIGNING && VBOX_SIGNING_MODE && VBOX_SIGN_ADDITIONS
+endif # VBOX_WIN_ATTESTATION_SIGNING && VBOX_SIGNING_MODE && VBOX_SIGN_ADDITIONS