Changeset 72305 in vbox

Timestamp:

May 23, 2018 4:01:22 PM (7 years ago)

Author:

vboxsync

Message:

Installer/Linux: bugref:9049: Support for split GUI functionality.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• install.sh (modified) (2 diffs)

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

@@ -254 +254 @@
         VBoxKeyboard.so \
         VirtualBox \
-        $(if $(VBOX_WITH_HARDENING),VirtualBox.so) \
+        $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VirtualBoxVM) \
+        $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBoxGlobal.so) \
         $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so)
+ ifdef VBOX_WITH_HARDENING
+  VBOX_LNX_STRIP_BIN += \
+        $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VirtualBoxVM.so,VirtualBox.so)
+ endif
  VBOX_LNX_NO_STRIP += \
         virtualbox.desktop \
@@ -403 +408 @@
                 -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \
                 -e "s;_HARDENED_;$(VBOX_WITH_HARDENING);g" \
+                -e "s;_GUI_WITH_SHARED_LIBRARY_;$(VBOX_GUI_WITH_SHARED_LIBRARY);g" \
                 -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
                 -e "s;_USERNAME_;$(USERNAME);g" \

trunk/src/VBox/Installer/linux/install.sh

@@ -34 +34 @@
 ARCH="_ARCH_"
 HARDENED="_HARDENED_"
+GUI_WITH_SHARED_LIBRARY="_GUI_WITH_SHARED_LIBRARY_"
 # The "BUILD_" prefixes prevent the variables from being overwritten when we
 # read the configuration from the previous installation.
@@ -278 +279 @@
     #                 and finally make sure the directory is only writable by the user (paranoid).
     if [ -n "$HARDENED" ]; then
-        test -e $INSTALLATION_DIR/VirtualBox     && chmod 4511 $INSTALLATION_DIR/VirtualBox
+        if [ -n "$GUI_WITH_SHARED_LIBRARY" ]; then
+            test -e $INSTALLATION_DIR/VirtualBoxVM   && chmod 4511 $INSTALLATION_DIR/VirtualBoxVM
+        else
+            test -e $INSTALLATION_DIR/VirtualBox     && chmod 4511 $INSTALLATION_DIR/VirtualBox
+        fi
         test -e $INSTALLATION_DIR/VBoxSDL        && chmod 4511 $INSTALLATION_DIR/VBoxSDL
         test -e $INSTALLATION_DIR/VBoxHeadless   && chmod 4511 $INSTALLATION_DIR/VBoxHeadless