Changeset 43418 in vbox

Timestamp:

Sep 24, 2012 2:35:38 PM (12 years ago)

Author:

vboxsync

Message:

Additions/solaris: Fix for Solaris 12 kernel package FMRI.

File:

• trunk/src/VBox/Installer/solaris/vboxconfig.sh (modified) (7 diffs)

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

@@ -237 +237 @@
         if test ! -z "$PKGFMRI"; then
             # The format is "pkg://solaris/system/[email protected],5.11-0.161:20110315T070332Z"
+            #            or "pkg://solaris/system/[email protected],5.11-5.12.0.0.0.4.1:20120908T030246Z"
             #            or "pkg://solaris/system/[email protected],5.11-0.175.0.0.0.1.0:20111012T032837Z"
-            STR_KERN=`echo "$PKGFMRI" | sed 's/^.*\@//;s/\:.*//;s/.*,//'`
-            if test ! -z "$STR_KERN"; then
-                # The format is "5.11-0.161" or "5.11-0.175.0.0.0.1.0"
-                HOST_OS_MAJORVERSION=`echo "$STR_KERN" | cut -f1 -d'-'`
-                HOST_OS_MINORVERSION=`echo "$STR_KERN" | cut -f2 -d'-' | cut -f2 -d '.'`
+            STR_KERN_MAJOR=`echo "$PKGFMRI" | sed 's/^.*\@//;s/\,.*//'`
+            if test ! -z "$STR_KERN_MAJOR"; then
+                # The format is "0.5.11" or "5.12"
+                # Let us just hardcode these for now, instead of trying to do things more generically. It's not
+                # worth trying to bring more order to chaos as it's clear that the version numbering is subject to breakage
+                # as it has been seen in the past.
+                if test "$STR_KERN_MAJOR" = "5.12"; then
+                    HOST_OS_MAJORVERSION="12"
+                elif test "$STR_KERN_MAJOR" = "0.5.11" || test "$STR_KERN_MAJOR" = "5.11"; then
+                    HOST_OS_MAJORVERSION="11"
+                else
+                    errorprint "Failed to parse the Solaris kernel major version."
+                    exit 1
+                fi
+
+                STR_KERN_MINOR=`echo "$PKGFMRI" | sed 's/^.*\@//;s/\:.*//;s/.*,//'`
+                if test ! -z "$STR_KERN_MINOR"; then
+                    # The format is "5.11-0.161" or "5.11-0.175.0.0.0.1.0" or "5.11-5.12.0.0.0.4.1"
+                    HOST_OS_MINORVERSION=`echo "$STR_KERN_MINOR" | cut -f2 -d'-' | cut -f2 -d '.'`
+                else
+                    errorprint "Failed to parse the Solaris kernel minor version."
+                    exit 1
+                fi
             else
-                errorprint "Failed to parse the Solaris kernel version."
+                errorprint "Failed to parse the Solaris kernel package version."
                 exit 1
-            fi        
-        else
-            errorprint "Failed to detect the Solaris kernel version."
+            fi
+        else
+            errorprint "Failed to detect the Solaris kernel package FMRI."
             exit 1
         fi
@@ -254 +273 @@
         HOST_OS_MAJORVERSION=`uname -r`
         if test -z "$HOST_OS_MAJORVERSION" || test "$HOST_OS_MAJORVERSION" != "5.10";  then
-            # S11 without 'pkg' ?? Something's wrong... bail.
-            errorprint "Solaris $HOST_OS_MAJOR_VERSION detected without executable $BIN_PKG !? Confused."
+            # S11 without 'pkg'?? Something's wrong... bail.
+            errorprint "Solaris $HOST_OS_MAJOR_VERSION detected without executable $BIN_PKG !? I are confused."
             exit 1
         fi
+        HOST_OS_MAJORVERSION="10"
         if test "$REMOTEINST" -eq 0; then
             # Use uname to verify it's S10.
@@ -274 +294 @@
             REMOTE_S10=`$BIN_PKGCHK -l -p /kernel/amd64/genunix $BASEDIR_PKGOPT 2> /dev/null | grep SUNWckr | tr -d ' \t'`
             if test ! -z "$REMOTE_S10" && test "$REMOTE_S10" = "SUNWckr"; then
-                HOST_OS_MAJORVERSION="5.10"
+                HOST_OS_MAJORVERSION="10"
                 HOST_OS_MINORVERSION=""
             else
@@ -586 +606 @@
     else
         # If host is S10 or S11 (< snv_159) or vboxbow isn't shipped, then load vboxflt
-        if test "$HOST_OS_MAJORVERSION" = "5.10" || test "$HOST_OS_MINORVERSION" -lt 159 || test ! -f "$DIR_CONF/vboxbow.conf"; then
+        if test "$HOST_OS_MAJORVERSION" -eq 10 || (test "$HOST_OS_MAJORVERSION" -eq 11 && test "$HOST_OS_MINORVERSION" -lt 159) || test ! -f "$DIR_CONF/vboxbow.conf"; then
             load_vboxflt
         else
@@ -595 +615 @@
 
     # Load VBoxUSBMon, VBoxUSB
-    if test -f "$DIR_CONF/vboxusbmon.conf" && test "$HOST_OS_MAJORVERSION" != "5.10"; then
-        # For VirtualBox 3.1 the new USB code requires Nevada > 123
-        if test "$HOST_OS_MINORVERSION" -gt 123; then
+    if test -f "$DIR_CONF/vboxusbmon.conf" && test "$HOST_OS_MAJORVERSION" != "10"; then
+        # For VirtualBox 3.1 the new USB code requires Nevada > 123 i.e. S12+ or S11 b124+
+        if test "$HOST_OS_MAJORVERSION" -gt 11 || (test "$HOST_OS_MAJORVERSION" -eq 11 && test "$HOST_OS_MINORVERSION" -gt 123); then
             # Add a group "vboxuser" (8-character limit) for USB access.
             # All users which need host USB-passthrough support will have to be added to this group.
@@ -630 +650 @@
             fi
         else
-            if test -n "$HOST_OS_MINORVERSION"; then
-                warnprint "Solaris 5.11 build 124 or higher required for USB support. Skipped installing USB support."
-            else
-                warnprint "Failed to determine Solaris 5.11 snv version. Skipped installing USB support."
-            fi
+            warnprint "Solaris 11 build 124 or higher required for USB support. Skipped installing USB support."
         fi
     fi
@@ -919 +935 @@
             # plumb and configure vboxnet0 for non-remote installs
             if test "$REMOTEINST" -eq 0; then
-                # S11 175a renames vboxnet0 as 'netX', undo this and rename it back
-                if test "$HOST_OS_MAJORVERSION" = "5.11" && test "$HOST_OS_MINORVERSION" -gt 174; then
+                # S11 175a renames vboxnet0 as 'netX', undo this and rename it back (S12+ or S11 b175+)
+                if test "$HOST_OS_MAJORVERSION" -gt 11 || (test "$HOST_OS_MAJORVERSION" -eq 11 && test "$HOST_OS_MINORVERSION" -gt 174); then
                     vanityname=`dladm show-phys -po link,device | grep vboxnet0 | cut -f1 -d':'`
                     if test $? -eq 0 && test ! -z "$vanityname" && test "$vanityname" != "vboxnet0"; then