Changeset 36850 in vbox

Timestamp:

Apr 26, 2011 4:12:43 PM (14 years ago)

Author:

vboxsync

Message:

Additions/solaris: Support 64-bit only Xorg binary releases.

File:

• trunk/src/VBox/Additions/solaris/Installer/postinstall.sh (modified) (2 diffs)

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

@@ -213 +213 @@
         vboxvideo64_dest_base=$vboxvideo32_dest_base/$solaris64dir
 
+        # snv_163 drops 32-bit support completely, and uses 32-bit locations for the 64-bit stuff. Ugly.
+        # We try to detect this by looking at bitness of "mouse_drv.so", and adjust our destination paths accordingly.
+        bitsize=`file $vboxmouse32_dest_base/mouse_drv.so | grep "32-bit"`
+        skip32="no"
+        if test -z "$bitsize"; then
+            skip32="yes"
+            vboxmouse64_dest_base=$vboxmouse32_dest_base
+            vboxvideo64_dest_base=$vboxvideo32_dest_base
+        fi
+
         # Make sure destination path exists
         if test ! -d $vboxmouse32_dest_base || test ! -d $vboxvideo32_dest_base || test ! -d $vboxmouse64_dest_base || test ! -d $vboxvideo64_dest_base; then
@@ -222 +232 @@
         else
             # 32-bit x11 drivers
-            if test -f "$vboxadditions32_path/$vboxmouse_src"; then
+            if test "$skip32" = "no" && test -f "$vboxadditions32_path/$vboxmouse_src"; then
                 vboxmouse_dest="$vboxmouse32_dest_base/vboxmouse_drv.so"
                 vboxvideo_dest="$vboxvideo32_dest_base/vboxvideo_drv.so"