Changeset 42989 in vbox

Timestamp:

Aug 25, 2012 8:05:23 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80321

Message:

Signing fix.

File:

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

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

@@ -761 +761 @@
                 ,$(INSTALL) -m 0755 $(VBOX_PATH_DIST)/VirtualBox.app/Contents/$(prog)           $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(prog)-$(KBUILD_TARGET_ARCH)$(NLTAB))
 endif
-        @# Create symlinks for all the binaries (corrected by postflight and the VirtualBox StartupItem to hardlinks).
-ifdef VBOX_WITH_COMBINED_PACKAGE
-        $(foreach bin, $(VBOX_DI_VBAPP_PROGS) $(VBOX_DI_VBAPP_OTHER_BINS) \
-                 ,$(LN) -s $(bin)-x86                                                           $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin)$(NLTAB))
-else
-        $(foreach bin, $(VBOX_DI_VBAPP_PROGS) $(VBOX_DI_VBAPP_OTHER_BINS) \
-                 ,$(LN) -s $(bin)-$(KBUILD_TARGET_ARCH)                                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin)$(NLTAB))
-endif
 #ifdef VBOX_WITH_HARDENING - disabled temporarily
 if 1
@@ -799 +791 @@
 endif
         @# Signed the binaries and the application bundle.
-        @# Note. We cannot sign the application binary here, since we switch to match the kernel bitness.
+        @# Note #1 - We cannot sign the application binary here, since we switch to match the kernel bitness.
+        @# Note #2 - Must sign -amd64/-x86 suffixed binaries without the suffix, or verification fails.
 ifdef VBOX_SIGNING_MODE
         $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
@@ -815 +808 @@
                 , $(foreach bin, $(VBOX_DI_VBAPP_PROGS) \
                 , \
-               $(NLTAB)$(MV) -- $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin) $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin)-tmp \
-               $(NLTAB)$(LN) -- $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin)-$(arch) $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin) \
+               $(NLTAB)$(MV) -- $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin)-$(arch) $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin) \
                 $(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin),org.virtualbox.app.macos.$(notdir $(bin))) \
-               $(NLTAB)$(RM) -- $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin) \
-               $(NLTAB)$(MV) -- $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin)-tmp $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin) \
+               $(NLTAB)$(MV) -- $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin) $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(bin)-$(arch) \
                 ))
  if 0 # requires codesign+framworks from Lion or later. Snow Leopard codesign says object file format invalid or unsuitable.