Changeset 7870 in vbox for trunk/src/VBox

Timestamp:

Apr 10, 2008 2:26:08 PM (17 years ago)

Author:

vboxsync

Message:

Solaris Guest Installer: vboxguest persistence and disabled stripping temporarily.

Location:

trunk/src/VBox/Additions/solaris

Files:

• Installer/makepackage.sh (modified) (1 diff)
• Installer/postinstall.sh (modified) (3 diffs)
• Installer/preremove.sh (modified) (1 diff)
• Installer/vboxguest.pkginfo (modified) (1 diff)
• Makefile.kmk (modified) (4 diffs)

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

@@ -25 +25 @@
 echo 'i postinstall=./postinstall.sh' >> prototype
 echo 'i preremove=./preremove.sh' >> prototype
+echo 'e sed /etc/devlink.tab ? ? ?' >> prototype
 find . -print | /usr/sfw/bin/ggrep -v -E 'prototype|makepackage.sh|vboxguest.pkginfo|postinstall.sh|preremove.sh' | pkgproto >> prototype
 
-/usr/bin/awk 'NF == 6 { $5 = "root"; $6 = "bin" } { print }' prototype > prototype2
-/usr/bin/awk 'NF == 6 { $3 = "opt/VirtualBoxAdditions/"$3"="$3 } { print }' prototype2 > prototype
+/usr/bin/awk 'NF == 6 && $2 == "none" { $5 = "root"; $6 = "bin" } { print }' prototype > prototype2
+/usr/bin/awk 'NF == 6 && $2 == "none" { $3 = "opt/VirtualBoxAdditions/"$3"="$3 } { print }' prototype2 > prototype
 
 # install the kernel module to the right place (for now only 32-bit guests)

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

@@ -29 +29 @@
 # create links
 echo "Creating links..."
-/usr/sbin/installf -c none $PKGINST /dev/vboxguest=../devices/pci@0,0/pci80ee,cafe@4:vboxguest s
+#/usr/sbin/installf -c none $PKGINST /dev/vboxguest=../devices/pci@0,0/pci80ee,cafe@4:vboxguest s
 /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
@@ -81 +81 @@
     rm -f $vboxadditions_path/vboxvideo_drv_*
     /usr/sbin/removef -f $PKGINST
-    
+
     # Some distros like Indiana have no xorg.conf, deal with this
     if ! (test -f '/etc/X11/xorg.conf' -o -f '/etc/X11/.xorg.conf'); then
@@ -91 +91 @@
 fi
 
+# Remove redundant files
+#/usr/sbin/removef $PKGINST $vboxadditions_path/etc/devlink.tab 1>/dev/null
+#/usr/sbin/removef $PKGINST $vboxadditions_path/etc 1>/dev/null
+#rm -rf $vboxadditions_path/etc
+#/usr/sbin/removef -f $PKGINST
+
 /usr/sbin/installf -f $PKGINST
+
+#/usr/sbin/devlinks
 
 # Setup our VBoxService SMF service

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

@@ -24 +24 @@
 /opt/VirtualBoxAdditions/vboxguest.sh stop
 
+# clean up link
+rm -f /dev/vboxguest
+
 echo "Done."
 

trunk/src/VBox/Additions/solaris/Installer/vboxguest.pkginfo

@@ -7 +7 @@
 EMAIL="[email protected]"
 BASEDIR="/"
-CLASSES="none"
+CLASSES=none sed
 DESC="VirtualBox Guest Additions for Solaris guests."
 

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

@@ -65 +65 @@
                 $(PATH_BIN)/additions/vboxmouse_drv_70.so \
                 $(PATH_BIN)/additions/vboxmouse_drv_71.so \
+                $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxdevlink.sed \
                 $(PATH_SUB_CURRENT)/solaris/Makefile.kmk
         $(call MSG_L1,Installing guest additions)
@@ -70 +71 @@
         $(QUIET)rm -rf $(SOLARISINSTDIR)
         $(QUIET)$(MKDIR) -p $(SOLARISINSTDIR)
+        $(QUIET)$(MKDIR) -p $(SOLARISINSTDIR)/etc
         $(QUIET)$(SED) \
                 -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
@@ -85 +87 @@
         $(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
@@ -95 +96 @@
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so                                       $(SOLARISINSTDIR)/vboxmouse_drv_70.so
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so                                       $(SOLARISINSTDIR)/vboxmouse_drv_71.so
+        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxdevlink.sed                  $(SOLARISINSTDIR)/etc/devlink.tab
         $(call MSG_L1,Creating install package: $@)
-        $(QUIET)$(SOLARISINSTDIR)/makepackage.sh $(SOLARISINSTDIR) $(PKGFILENAME) 1>/dev/null 2>/dev/null
+        $(QUIET)$(SOLARISINSTDIR)/makepackage.sh $(SOLARISINSTDIR) $(PKGFILENAME)
         $(QUIET)$(INSTALL) -m 0644 $(SOLARISINSTDIR)/$(PKGFILENAME) $(PATH_BIN)/additions/$(PKGFILENAME)