Changeset 43427 in vbox

Timestamp:

Sep 25, 2012 11:56:06 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80926

Message:

Solaris/installer: Try handle the proposed PSARC versioning scheme for Solaris 12 kernel packages. This is not yet being used in the transitional period.

File:

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

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

@@ -239 +239 @@
             #            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"
+            #            or "pkg://solaris/system/[email protected]:20121012T032837Z"
             STR_KERN_MAJOR=`echo "$PKGFMRI" | sed 's/^.*\@//;s/\,.*//'`
             if test ! -z "$STR_KERN_MAJOR"; then
@@ -250 +251 @@
                     HOST_OS_MAJORVERSION="11"
                 else
-                    errorprint "Failed to parse the Solaris kernel major version."
-                    exit 1
+                    # This could be the PSARC/2012/240 naming scheme for S12.
+                    # The format is "pkg://solaris/system/[email protected]:20121012T032837Z"
+                    # The "5.12" following the "@" is the nominal version which we ignore for now as it is
+                    # not set by most pkg(5) tools...
+                    # STR_KERN_MAJOR is now of the format "5.12-5.12.0.0.0.9.1.3.0:20121012T032837Z" with '9' representing
+                    # the build number.
+                    BRANCH_VERSION=STR_KERN_MAJOR
+                    HOST_OS_MAJORVERSION=`echo "$BRANCH_VERSION" | cut -f2 -d'-' | cut -f1,2 -d'.'`
+                    if test "HOST_OS_MAJORVERSION" = "5.12"; then
+                        HOST_OS_MINORVERSION=`echo "$BRANCH_VERSION" | cut -f2 -d'-' | cut -f6 -d'.'`
+                        return 0
+                    else
+                        errorprint "Failed to parse the Solaris kernel major version."
+                        exit 1
+                    fi
                 fi
 
+                # This applies only to S11 and S12 where the transitional "@5.12," component version is
+                # still part of the pkg(5) package FMRI. The regular S12 will follow the PSARC/2012/240 naming scheme above.
                 STR_KERN_MINOR=`echo "$PKGFMRI" | sed 's/^.*\@//;s/\:.*//;s/.*,//'`
                 if test ! -z "$STR_KERN_MINOR"; then