Changeset 15921 in vbox

Timestamp:

Jan 13, 2009 4:55:32 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/installer: Changes for #3381 (combined package).

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (8 diffs)
• postinstall.sh (modified) (1 diff)

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

@@ -255 +255 @@
 # Guest Additions
 ifdef VBOX_WITH_ADDITIONS_PACKING
- SOLARIS_NO_STRIP += \
+ SOLARIS_COMMON += \
         additions/VBoxGuestAdditions.iso
 endif
@@ -289 +289 @@
         $(addprefix $(SOLARIS_INST_DIR_32)/,$(SOLARIS_NO_STRIP)) \
         $(addprefix $(SOLARIS_INST_DIR_32)/,$(SOLARIS_QTLIBS)) \
-        $(addprefix $(SOLARIS_INST_DIR_32)/,VBoxPython.so) \
-        $(addprefix $(SOLARIS_INST_DIR_64)/,VBoxPython.so)
+        $(addprefix $(SOLARIS_OUT_BIN_32)/,VBoxPython.so) \
+        $(addprefix $(SOLARIS_OUT_BIN_64)/,VBoxPython.so)
 else
  SOLARIS_ARCH_DEPFILES = $(addprefix $(SOLARIS_INST_DIR_ISA)/,$(SOLARIS_STRIP_EXES)) \
@@ -301 +301 @@
 
 BLDDIRS += $(foreach d,\
+        additions \
         rdesktop-vrdp-keymaps \
         $(SOLARIS_DIR_NAME_64) \
-        $(SOLARIS_DIR_NAME_64)/additions \
         $(SOLARIS_DIR_NAME_64)/components \
         $(SOLARIS_DIR_NAME_64)/nls \
@@ -309 +309 @@
         $(SOLARIS_DIR_NAME_64)/$(VBOX_SOL_PYTHON_DIR) \
         $(SOLARIS_DIR_NAME_32) \
-        $(SOLARIS_DIR_NAME_32)/additions \
         $(SOLARIS_DIR_NAME_32)/components \
         $(SOLARIS_DIR_NAME_32)/nls \
@@ -361 +360 @@
         $(call MSG_L1,Installing binaries $(SOLARIS_INST_DIR))
 ifdef VBOX_WITH_COMBINED_SOLARIS_PACKAGE
-        $(QUIET)$(if $(VBOX_WITH_ADDITIONS_PACKING),$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN_64)/additions/VBoxGuestAdditions.iso            $(SOLARIS_INST_DIR_64)/additions/)
-        $(QUIET)$(if $(VBOX_WITH_ADDITIONS_PACKING),$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN_32)/additions/VBoxGuestAdditions.iso            $(SOLARIS_INST_DIR_32)/additions/)
+        $(QUIET)$(if $(VBOX_WITH_ADDITIONS_PACKING),$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN_32)/additions/VBoxGuestAdditions.iso            $(SOLARIS_INST_DIR)/additions/)
 else
-        $(QUIET)$(if $(VBOX_WITH_ADDITIONS_PACKING),$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN)/additions/VBoxGuestAdditions.iso               $(SOLARIS_INST_DIR_ISA)/additions/)
+        $(QUIET)$(if $(VBOX_WITH_ADDITIONS_PACKING),$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN)/additions/VBoxGuestAdditions.iso               $(SOLARIS_INST_DIR)/additions/)
 endif
         $(call MSG_L1,Installing files $(SOLARIS_INST_DIR))
@@ -378 +376 @@
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_INST_DIR)/LICENSE)
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_INST_DIR)/vbox.copyright)
-ifdef VBOX_WITH_SOLARIS_COMBINED_PACKAGE
-        $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.x86//libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2    $(SOLARIS_INST_DIR_32)/libSDL-1.2.so.0,)
+ifdef VBOX_WITH_COMBINED_SOLARIS_PACKAGE
+        $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.x86/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2     $(SOLARIS_INST_DIR_32)/libSDL-1.2.so.0,)
         $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.amd64/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2   $(SOLARIS_INST_DIR_64)/libSDL-1.2.so.0,)
         @# @todo -XXX- how to get rid of this manual MKDIR ?
         $(QUIET)$(MKDIR) $(SOLARIS_INST_DIR_64)/$(VBOX_SOL_PYTHON_DIR)
-        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_64)/VBoxPython.so    $(SOLARIS_INST_DIR_64)/$(VBOX_SOL_PYTHON_DIR)/VBoxPython.so,)
+        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_32)/VBoxPython.so    $(SOLARIS_INST_DIR_32)/VBoxPython.so,)
         $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_64)/VBoxPython.so    $(SOLARIS_INST_DIR_64)/$(VBOX_SOL_PYTHON_DIR)/VBoxPython.so,)
         $(QUIET)$(if $(VBOX_WITH_QT4GUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS)/solaris.x86/qt/v4.3.3-r1/bin/qtconfig           $(SOLARIS_INST_DIR_32)/VBoxQtconfig,)
@@ -456 +454 @@
 
 $(addprefix $(SOLARIS_INST_DIR_32)/,$(SOLARIS_QTLIBS)): \
-                $(SOLARIS_INST_DIR_32)/% : $(PATH_DEVTOOLS_TRG)/qt/v4.3.3-r1/lib/% | $$(dir $$@)
+                $(SOLARIS_INST_DIR_32)/% : $(PATH_DEVTOOLS)/solaris.x86/qt/v4.3.3-r1/lib/% | $$(dir $$@)
         $(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s,) $< $@
 
@@ -479 +477 @@
 
 $(addprefix $(SOLARIS_INST_DIR_64)/,$(SOLARIS_QTLIBS)): \
-                $(SOLARIS_INST_DIR_64)/% : $(PATH_DEVTOOLS_TRG)/qt/v4.3.3-r1/lib/% | $$(dir $$@)
+                $(SOLARIS_INST_DIR_64)/% : $(PATH_DEVTOOLS)/solaris.amd64/qt/v4.3.3-r1/lib/% | $$(dir $$@)
         $(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s,) $< $@
 

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

@@ -84 +84 @@
     if test -d $VBOXBASEDIR/amd64; then
         /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/amd64/rdesktop-vrdp-keymaps=$VBOXBASEDIR/rdesktop-vrdp-keymaps s
+        /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/amd64/additions=$VBOXBASEDIR/additions s
     fi
     if test -d $VBOXBASEDIR/i386; then
         /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/i386/rdesktop-vrdp-keymaps=$VBOXBASEDIR/rdesktop-vrdp-keymaps s
-    fi    
+        /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/i386/additions=$VBOXBASEDIR/additions s
+    fi
     /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxHeadless=/$VBOXBASEDIR/VBox.sh s
     /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxVRDP=$VBOXBASEDIR/VBox.sh s