Changeset 75064 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Oct 25, 2018 11:54:47 AM (6 years ago)

Author:

vboxsync

Message:

Installer/solaris: bugref:9049: Support for split GUI functionality. Fix the suid permissions.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (1 diff)
• makepackage.sh (modified) (3 diffs)

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

@@ -678 +678 @@
         $(REDIRECT) -C $(VBOX_PATH_SOL_INST_SRC) -- $(VBOX_PATH_SI_SCRATCH_PKG)/makepackage.sh \
                 $(if-expr defined(VBOX_WITH_HARDENING),--hardened,) \
+                $(if-expr defined(VBOX_GUI_WITH_SHARED_LIBRARY),--guisharedlib,) \
                 $(VBOX_PATH_SI_SCRATCH_PKG) \
                 $(PKG_FILENAME) \

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -24 +24 @@
 # Parse options.
 HARDENED=""
+GUISHAREDLIB=""
 while test $# -ge 1;
 do
@@ -29 +30 @@
         --hardened)
             HARDENED=1
+            ;;
+        --guisharedlib)
+            GUISHAREDLIB=1
             ;;
     *)
@@ -186 +190 @@
 if test -n "$HARDENED"; then
     $VBOX_AWK 'NF == 6 \
-        && (    $3 == "opt/VirtualBox/amd64/VirtualBox" \
-            ||  $3 == "opt/VirtualBox/amd64/VirtualBox3" \
+        && (    (   $3 == "opt/VirtualBox/amd64/VirtualBox" \
+                 && "'$GUISHAREDLIB'" == "") \
+            ||  $3 == "opt/VirtualBox/amd64/VirtualBoxVM" \
             ||  $3 == "opt/VirtualBox/amd64/VBoxHeadless" \
             ||  $3 == "opt/VirtualBox/amd64/VBoxSDL" \
             ||  $3 == "opt/VirtualBox/i386/VirtualBox" \
-            ||  $3 == "opt/VirtualBox/i386/VirtualBox3" \
             ||  $3 == "opt/VirtualBox/i386/VBoxHeadless" \
             ||  $3 == "opt/VirtualBox/i386/VBoxSDL" \