Changeset 12144 in vbox for trunk/src/VBox/Additions/solaris/Installer

Timestamp:

Sep 5, 2008 4:18:36 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/additions: backed out combined installer for now.

Location:

trunk/src/VBox/Additions/solaris/Installer

Files:

• makepackage.sh (modified) (2 diffs)
• postinstall.sh (modified) (3 diffs)

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

@@ -22 +22 @@
 #       makespackage.sh $(PATH_TARGET)/install packagename $(KBUILD_TARGET_ARCH)
 
-if test -z "$2"; then
-    echo "Usage: $0 installdir packagename"
+if test -z "$3"; then
+    echo "Usage: $0 installdir packagename x86|amd64"
     exit 1
 fi
@@ -65 +65 @@
 filelist_fixup prototype '$2 == "none"'                                                     '$3 = "opt/VirtualBoxAdditions/"$3"="$3'
 
-# 32-bit kernel module
-filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxguest=vboxguest"'              '$3 = "platform/i86pc/kernel/drv/vboxguest=vboxguest"; $6="sys"'
-
-# 64-bit kernel module
-filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/vboxguest=amd64/vboxguest"'  '$3 = "platform/i86pc/kernel/drv/amd64/vboxguest=amd64/vboxguest"; $6="sys"'
+# install kernel module in the right place
+if test "3" = "x86"; then
+    filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxguest=vboxguest"'           '$3 = "platform/i86pc/kernel/drv/vboxguest=vboxguest"; $6="sys"'
+else
+    filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxguest=vboxguest"'           '$3 = "platform/i86pc/kernel/drv/amd64/vboxguest=vboxguest"; $6="sys"'
+fi
 
 # kernel module config file

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

@@ -22 +22 @@
 sync
 vboxadditions_path="/opt/VirtualBoxAdditions"
-vboxadditions64_path="/opt/VirtualBoxAdditions/amd64"
-solaris64dir="amd64"
 
 # vboxguest.sh would've been installed, we just need to call it.
 $vboxadditions_path/vboxguest.sh restart silentunload
 
-# Set permissions
+# get what ISA the guest is running 
+cputype=`isainfo -k` 
+isadir="" 
+if test "$cputype" = "amd64"; then 
+    isadir="amd64" 
+fi 
+
+
+# suid permissions for timesync
 chmod 04755 $vboxadditions_path/VBoxService
-chmod a+x $vboxadditions_path/VBox.sh
 chmod a+x $vboxadditions_path/VBoxClient
 chmod a+x $vboxadditions_path/VBoxControl
 chmod a+x $vboxadditions_path/VBoxRandR.sh
-chmod 04755 $vboxadditions64_path/VBoxService
-chmod a+x $vboxadditions64_path/VBoxClient
-chmod a+x $vboxadditions64_path/VBoxControl
 
 # 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 /usr/bin/VBoxClient=$vboxadditions_path/VBox.sh s
-/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxService=$vboxadditions_path/VBox.sh s
-/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxControl=$vboxadditions_path/VBox.sh 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
+/usr/sbin/installf -c none $PKGINST /usr/bin/VBoxControl=$vboxadditions_path/VBoxControl s
 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxRandR=$vboxadditions_path/VBoxRandR.sh s
 
@@ -55 +57 @@
 case "$xorgversion" in
     1.3.* )
-        vboxmouse_src="vboxmouse_drv_71.so"
-        vboxvideo_src="vboxvideo_drv_13.so"
+        vboxmouse_src="$vboxadditions_path/vboxmouse_drv_71.so"
+        vboxvideo_src="$vboxadditions_path/vboxvideo_drv_13.so"
         ;;
     1.4.* )
-        vboxmouse_src="vboxmouse_drv_14.so"
-        vboxvideo_src="vboxvideo_drv_14.so"
+        vboxmouse_src="$vboxadditions_path/vboxmouse_drv_14.so"
+        vboxvideo_src="$vboxadditions_path/vboxvideo_drv_14.so"
         ;;
     7.1.* | *7.2.* )
-        vboxmouse_src="vboxmouse_drv_71.so"
-        vboxvideo_src="vboxvideo_drv_71.so"
+        vboxmouse_src="$vboxadditions_path/vboxmouse_drv_71.so"
+        vboxvideo_src="$vboxadditions_path/vboxvideo_drv_71.so"
             ;;
     6.9.* | 7.0.* )
-        vboxmouse_src="vboxmouse_drv_70.so"
-        vboxvideo_src="vboxvideo_drv_70.so"
+        vboxmouse_src="$vboxadditions_path/vboxmouse_drv_70.so"
+        vboxvideo_src="$vboxadditions_path/vboxvideo_drv_70.so"
         ;;
 esac
@@ -82 +84 @@
     echo "Configuring Xorg..."
 
-    # 32-bit
-    vboxmouse_dest="/usr/X11/lib/modules/input/vboxmouse_drv.so"
-    vboxvideo_dest="/usr/X11/lib/modules/drivers/vboxvideo_drv.so"
+    vboxmouse_dest="/usr/X11/lib/modules/input/$isadir/vboxmouse_drv.so"
+    vboxvideo_dest="/usr/X11/lib/modules/drivers/$isadir/vboxvideo_drv.so"
     /usr/sbin/installf -c none $PKGINST "$vboxmouse_dest" f
     /usr/sbin/installf -c none $PKGINST "$vboxvideo_dest" f
-    cp "$vboxadditions_path/$vboxmouse_src" "$vboxmouse_dest"
-    cp "$vboxadditions_path/$vboxvideo_src" "$vboxvideo_dest"
-
-    # 64-bit
-    vboxmouse_dest="/usr/X11/lib/modules/input/$solaris64dir/vboxmouse_drv.so"
-    vboxvideo_dest="/usr/X11/lib/modules/drivers/$solaris64dir/vboxvideo_drv.so"
-    /usr/sbin/installf -c none $PKGINST "$vboxmouse_dest" f
-    /usr/sbin/installf -c none $PKGINST "$vboxvideo_dest" f
-    cp "$vboxadditions64_path/$vboxmouse_src" "$vboxmouse_dest"
-    cp "$vboxadditions64_path/$vboxvideo_src" "$vboxvideo_dest"
+    cp "$vboxmouse_src" "$vboxmouse_dest"
+    cp "$vboxvideo_src" "$vboxvideo_dest"
 
     # Removing redudant files
-    # 32-bit
     /usr/sbin/removef $PKGINST $vboxadditions_path/vboxmouse_drv_* 1>/dev/null 2>/dev/null
     /usr/sbin/removef $PKGINST $vboxadditions_path/vboxvideo_drv_* 1>/dev/null 2>/dev/null
     rm -f $vboxadditions_path/vboxmouse_drv_*
     rm -f $vboxadditions_path/vboxvideo_drv_*
-
-    # 64-bit
-    /usr/sbin/removef $PKGINST $vboxadditions64_path/vboxmouse_drv_* 1>/dev/null 2>/dev/null
-    /usr/sbin/removef $PKGINST $vboxadditions64_path/vboxvideo_drv_* 1>/dev/null 2>/dev/null
-    rm -f $vboxadditions64_path/vboxmouse_drv_*
-    rm -f $vboxadditions64_path/vboxvideo_drv_*
 
     /usr/sbin/removef -f $PKGINST