Changeset 93248 in vbox

Timestamp:

Jan 15, 2022 12:54:32 AM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk: Fixed variable mixup with new signing orderdeps. bugref:10162

File:

• trunk/Config.kmk (modified) (5 diffs)

trunk/Config.kmk

@@ -4086 +4086 @@
   if "$(VBOX_SIGNING_MODE)" == "release" || defined(VBOX_WITH_HARDENING)
    ## Commands for signing an executable or a dll image after link.
-   VBOX_SIGN_IMAGE_CMDS      ?= $(if $(eq $(tool_do),LINK_LIBRARY),,$(call VBOX_SIGN_IMAGE_FN,$(out),,2))
-   VBOX_SIGN_IMAGE_ORDERDEPS ?= $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_SIGN_IMAGE_ORDERDEPS))
+   VBOX_SIGN_IMAGE_CMDS           ?= $(if $(eq $(tool_do),LINK_LIBRARY),,$(call VBOX_SIGN_IMAGE_FN,$(out),,2))
+   VBOX_SIGN_IMAGE_CMDS_ORDERDEPS ?= $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_SIGN_IMAGE_ORDERDEPS))
   endif
   ## Enable signing of the additions.
@@ -4870 +4870 @@
         $(PATH_STAGE_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB)
   TEMPLATE_VBoxRc_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)
-  TEMPLATE_VBoxRc_ORDERDEPS          = $(VBOX_SIGN_IMAGE_ORDERDEPS)
+  TEMPLATE_VBoxRc_ORDERDEPS          = $(VBOX_SIGN_IMAGE_CMDS_ORDERDEPS)
  endif # pe
 
@@ -5788 +5788 @@
 
  TEMPLATE_VBOXR3EXE_POST_CMDS          = $(VBOX_UTF8_MANIFEST_CMDS)$(NLTAB)$(VBOX_SIGN_IMAGE_CMDS)
- TEMPLATE_VBOXR3EXE_ORDERDEPS          = $(VBOX_SIGN_IMAGE_ORDERDEPS)
+ TEMPLATE_VBOXR3EXE_ORDERDEPS          = $(VBOX_SIGN_IMAGE_CMDS_ORDERDEPS)
  if defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86"
   TEMPLATE_VBOXR3EXE_POST_CMDS.win.x86 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB)$(TEMPLATE_VBOXR3EXE_POST_CMDS))
@@ -6825 +6825 @@
  endif
  TEMPLATE_VBOXMAINEXE_POST_CMDS          = $(VBOX_UTF8_MANIFEST_CMDS)$(NLTAB)$(VBOX_SIGN_IMAGE_CMDS)
- TEMPLATE_VBOXMAINEXE_ORDERDEPS          = $(VBOX_SIGN_IMAGE_ORDERDEPS)
+ TEMPLATE_VBOXMAINEXE_ORDERDEPS          = $(VBOX_SIGN_IMAGE_CMDS_ORDERDEPS)
 
 else # the GCC guys:
@@ -7468 +7468 @@
   endif
   TEMPLATE_VBOXQTGUIEXE_POST_CMDS     = $(VBOX_UTF8_MANIFEST_CMDS)$(NLTAB)$(VBOX_SIGN_IMAGE_CMDS)
-  TEMPLATE_VBOXQTGUIEXE_ORDERDEPS     = $(VBOX_SIGN_IMAGE_ORDERDEPS)
+  TEMPLATE_VBOXQTGUIEXE_ORDERDEPS     = $(VBOX_SIGN_IMAGE_CMDS_ORDERDEPS)
 
  else # the gcc guys: