Changeset 7886 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 10, 2008 4:29:58 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

29511

Message:

Additions/X11: add VBoxRandR to solaris guest installer.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/VBoxGuest-solaris.c (modified) (1 diff)
• solaris/Installer/postinstall.sh (modified) (1 diff)
• solaris/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -30 +30 @@
 #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
 
-#if defined(DEBUG_ramshankar) && !defined(LOG_ENABLED)
-#define LOG_ENABLED
-#endif
 #include "VBoxGuestInternal.h"
 #include <VBox/log.h>

trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

@@ -32 +32 @@
 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxClient=$vboxadditions_path/VBoxClient s
 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxService=$vboxadditions_path/VBoxService s
+/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxRandR=$vboxadditions_path/VBoxRandR.sh s
 
 # Install Xorg components to the required places

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

@@ -54 +54 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf \
+                $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh \
                 $(PATH_BIN)/additions/vboxguest \
                 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf \
@@ -85 +86 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl                         $(SOLARISINSTDIR)/x11config.pl
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf                    $(SOLARISINSTDIR)/solaris_xorg.conf
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh                         $(SOLARISINSTDIR)/VBoxRandR.sh
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf  $(SOLARISINSTDIR)/vboxguest.conf
         $(QUIET)$(CP) -f $(PATH_BIN)/additions/vboxguest                                                    $(SOLARISINSTDIR)/vboxguest
+        $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARISINSTDIR)/vboxguest,)
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxClient                                                $(SOLARISINSTDIR)/VBoxClient
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxService                                               $(SOLARISINSTDIR)/VBoxService