Changeset 72282 in vbox for trunk/src

Timestamp:

May 22, 2018 9:53:39 AM (7 years ago)

Author:

vboxsync

Message:

Installer/Darwin: bugref:9049: postflight fix for split gui.

Location:

trunk/src/VBox/Installer/darwin

Files:

• Makefile.kmk (modified) (1 diff)
• VirtualBox/postflight (modified) (1 diff)

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

@@ -797 +797 @@
         @# Copy the resources.
         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VirtualBox/preflight                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/
-ifdef VBOX_WITH_HARDENING
+if defined(VBOX_WITH_HARDENING) && !defined(VBOX_GUI_WITH_SHARED_LIBRARY)
         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VirtualBox/postflight                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/
 else
-        $(SED) -s '/WITH_HARDENING/d' -o $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/postflight $(VBOX_PATH_DI_SRC)/VirtualBox/postflight
+        $(SED)  $(if-expr !defined(VBOX_WITH_HARDENING),-e '/WITH_HARDENING/d',) \
+                $(if-expr !defined(VBOX_GUI_WITH_SHARED_LIBRARY),-e '/WITH_SHARED_LIBRARY/d',) \
+                --output $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/postflight \
+                $(VBOX_PATH_DI_SRC)/VirtualBox/postflight
         $(CHMOD) 0755 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/postflight
 endif

trunk/src/VBox/Installer/darwin/VirtualBox/postflight

@@ -91 +91 @@
 #
 SET_UID_BINARIES="VBoxNetAdpCtl"
-SET_UID_BINARIES="${SET_UID_BINARIES} VBoxHeadless VirtualBox VirtualBoxVM VBoxNetDHCP VBoxNetNAT" # WITH_HARDENING
+SET_UID_BINARIES="${SET_UID_BINARIES} VBoxHeadless VirtualBoxVM VBoxNetDHCP VBoxNetNAT" # WITH_HARDENING
+SET_UID_BINARIES="${SET_UID_BINARIES} VirtualBox"                                       # WITH_HARDENING WITH_SHARED_LIBRARY
 for bin in ${SET_UID_BINARIES}; do
     chmod u+s "/Applications/VirtualBox.app/Contents/MacOS/${bin}"