Changeset 85316 in vbox

Timestamp:

Jul 13, 2020 6:20:02 PM (5 years ago)

Author:

vboxsync

Message:

Additions/darwin: avoid double quoting of the file names to sign

File:

• trunk/src/VBox/Additions/darwin/Installer/Makefile.kmk (modified) (2 diffs)

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

@@ -350 +350 @@
         $(INSTALL) -m 0755 $(VBOX_ADD_PATH_DI_SRC)/DiskImage/Uninstall.tool  "$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/"
 ifdef VBOX_SIGNING_MODE
-        $(call VBOX_SIGN_FILE_FN,"$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/Uninstall.tool",org.virtualbox.app.guestadditions.uninstaller)
+        $(call VBOX_SIGN_FILE_FN,$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/Uninstall.tool,org.virtualbox.app.guestadditions.uninstaller)
 endif
 
@@ -365 +365 @@
  ifdef VBOX_WITH_COMBINED_PACKAGE
         $(foreach binary, $(VBOX_DI_VB_GA_BINARIES) \
-                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,"$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary)",org.virtualbox.app.guestadditions.$(notdir $(binary))) )
-        $(foreach binary, $(VBOX_DI_VB_GA_BINARIES) \
-                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,"$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary)-x86",org.virtualbox.app.guestadditions.$(notdir $(binary))-x86) )
-        $(foreach binary, $(VBOX_DI_VB_GA_BINARIES) \
-                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,"$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary)-amd64",org.virtualbox.app.guestadditions.$(notdir $(binary))-amd64) )
+                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary),org.virtualbox.app.guestadditions.$(notdir $(binary))) )
+        $(foreach binary, $(VBOX_DI_VB_GA_BINARIES) \
+                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary)-x86,org.virtualbox.app.guestadditions.$(notdir $(binary))-x86) )
+        $(foreach binary, $(VBOX_DI_VB_GA_BINARIES) \
+                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary)-amd64,org.virtualbox.app.guestadditions.$(notdir $(binary))-amd64) )
  else
         $(foreach binary, $(VBOX_DI_VB_GA_BINARIES) \
-                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,"$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary)",org.virtualbox.app.guestadditions.$(notdir $(binary))) )
-        $(foreach binary, $(VBOX_DI_VB_GA_BINARIES) \
-                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,"$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary)-$(KBUILD_TARGET_ARCH)",org.virtualbox.app.guestadditions.$(notdir $(binary))-$(KBUILD_TARGET_ARCH)) )
+                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary),org.virtualbox.app.guestadditions.$(notdir $(binary))) )
+        $(foreach binary, $(VBOX_DI_VB_GA_BINARIES) \
+                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/$(binary)-$(KBUILD_TARGET_ARCH),org.virtualbox.app.guestadditions.$(notdir $(binary))-$(KBUILD_TARGET_ARCH)) )
  endif
 endif