Changeset 83033 in vbox for trunk/src/VBox/Installer/darwin

Timestamp:

Feb 10, 2020 1:40:54 PM (5 years ago)

Author:

vboxsync

Message:

/Config.kmk,/Makefile.kmk,Installer/darwin,FE/QT,SUPHard: Eliminated the symlinks under Resources/VirtualBoxVM.app to avoid confusing codesign and notarization. bugref:9466
Note! Best to do a clean build on mac (or at a minimum rm -Rf out/darwin.amd64/*/dist/VirtualBox.app/Contents/Frameworks/ out/darwin.amd64/*/dist/VirtualBox.app/Contents/plugins/).

• SUPHard: Added new location SUPSECMAIN_FLAGS_LOC_OSX_HLP_APP (darwin only) for indicating a helper application and that hardened dylib and the rest of VirtualBox isn't in the executable directory.
• SUPHard: Added a corresponding internal path ID kSupID_AppMacHelper (darwin only) for finding VirtualBoxVM for verification now that it is no longer in the main app binary directory.
• /Config.kmk: Run install_name_tool after linking Qt binaries on darwin fix the Qt import paths (@executable_path/../Frameworks/ doesn't work for VirtualBoxVM any more).
• /Makefile.kmk: Run install_name_tool during installation of Qt frameworks and plugins to use @rpath in non-hardened builds and the absolute paths in hardened ones (latter done by Installer/darwin/Makefile.kmk previously).
• FE/Qt,Installer/darwin: Adjustments and path hacks.

File:

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

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

@@ -361 +361 @@
 
 VBOX_DI_VBAPP_PROGS_HARDENED = \
-        MacOS/VirtualBoxVM \
+        Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM \
         MacOS/VBoxHeadless \
         MacOS/VBoxNetDHCP \
@@ -414 +414 @@
 endif
 ifdef VBOX_WITH_HARDENING
- VBOX_DI_VBAPP_DYLIBS += $(addsuffix .dylib,$(VBOX_DI_VBAPP_PROGS_HARDENED))
+ VBOX_DI_VBAPP_DYLIBS += $(addprefix MacOS/,$(addsuffix .dylib,$(notdir $(VBOX_DI_VBAPP_PROGS_HARDENED))))
 endif
 ifdef VBOX_WITH_HDDPARALLELS_INSTALL
@@ -522 +522 @@
 
 VBOX_DI_VBAPP_SYMLINKS = \
-        Resources/VirtualBoxVM.app/Contents/MacOS=>../../../MacOS/ \
-        Resources/VirtualBoxVM.app/Contents/plugins=>../../../plugins/ \
-        Resources/VirtualBoxVM.app/Contents/Frameworks=>../../../Frameworks/ \
         Resources/vmstarter.app/Contents/MacOS=>../../../MacOS/ \
         $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
@@ -684 +681 @@
         $(foreach prog, $(VBOX_DI_VBAPP_PROGS) $(VBOX_DI_VBAPP_PROGS_HARDENED) \
                 ,$(INSTALL) -m 0755 $(VBOX_PATH_DIST)/VirtualBox.app/Contents/$(prog)           $(VBOX_PATH_VBOX_APP_TMP)/Contents/$(prog)$(NLTAB))
-#ifdef VBOX_WITH_HARDENING - disabled temporarily
-if 1
-        @# We cannot use @executable_path together with setuid binaries, dyld gets upset about it. So, fix Qt libs and users.
-        $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
-                ,install_name_tool -id /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-                        $(VBOX_PATH_VBOX_APP_TMP)/Contents/Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod)$(NLTAB) )
-        $(foreach f, \
-                $(VBOX_DI_VBAPP_DYLIBS) \
-                $(VBOX_DI_VBAPP_DYLIBS.$(KBUILD_TARGET_ARCH)) \
-                $(VBOX_DI_VBAPP_PROGS) \
-                $(VBOX_DI_VBAPP_PROGS_HARDENED) \
-                ,install_name_tool \
-                        $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
-                                -change           @executable_path/../Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-                                -change               $(VBOX_PATH_QT)/Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-                                -change                           $(PATH_SDK_QT)/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-                                -change                                          $(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-                                ) \
-                        $(VBOX_PATH_VBOX_APP_TMP)/Contents/$(f)$(NLTAB) )
-endif
 ifdef VBOX_UNATTENDED_TEMPLATES
 # Unattended installation template scripts.
@@ -780 +753 @@
         sudo chmod u+s $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/VBoxNetAdpCtl
 ifdef VBOX_WITH_HARDENING
-        sudo chmod u+s \
-                $(foreach bin,VBoxHeadless VirtualBoxVM VBoxNetDHCP VBoxNetNAT,\
-                        $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/$(bin))
+        sudo chmod u+s $(foreach bin,$(VBOX_DI_VBAPP_PROGS_HARDENED),$(VBOX_PATH_VBOX_APP_TMP)/Contents/$(bin))
+endif
+if 0 # Handy for testing the app bundle w/o having to reinstall all the time (just untar it into -C /Applications/)
+        $(RM) -f -- "$(PATH_OUT)/VirtualBox.app.tar.gz"
+        tar -czf "$(PATH_OUT)/VirtualBox.app.tar.gz" -C "$(VBOX_PATH_VBOX_APP_TMP)/.." VirtualBox.app
 endif
         @# Do keyword replacement in the package info and description files.