Changeset 73911 in vbox for trunk/src

Timestamp:

Aug 27, 2018 12:09:03 PM (6 years ago)

Author:

vboxsync

Message:

Installer/darwin: Make sure the postflight sed invocation always has an expression. Fixed inverted logic in postflight script. bugref:9049

Location:

trunk/src/VBox/Installer/darwin

Files:

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

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

@@ -801 +801 @@
 else
         $(SED)  $(if-expr !defined(VBOX_WITH_HARDENING),-e '/WITH_HARDENING/d',) \
-                $(if-expr !defined(VBOX_GUI_WITH_SHARED_LIBRARY),-e '/WITH_SHARED_LIBRARY/d',) \
+                $(if-expr !defined(VBOX_GUI_WITH_SHARED_LIBRARY),-e '/WITH_SHARED_LIBRARY/d',-e '/WITHOUT_SHARED_LIBRARY/d') \
                 --output $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/postflight \
                 $(VBOX_PATH_DI_SRC)/VirtualBox/postflight

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

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