[Ocfs2-commits] jlbec commits r2777 - in branches/ocfs2-1.2/vendor: rhel4 sles9

[svn-commits@oss.oracle.com]

Author: jlbec
Signed-off-by: mfasheh
Date: 2006-02-23 15:52:35 -0600 (Thu, 23 Feb 2006)
New Revision: 2777

Modified:
   branches/ocfs2-1.2/vendor/rhel4/kernel.guess
   branches/ocfs2-1.2/vendor/sles9/kernel.guess
Log:

o Restrict SLES9 builds to SP3 and higher (2.6.5-7.244)
o Restrict RHEL4 builds to U2 and higher (2.6.9-22.EL)

Signed-off-by: mfasheh



Modified: branches/ocfs2-1.2/vendor/rhel4/kernel.guess
===================================================================
--- branches/ocfs2-1.2/vendor/rhel4/kernel.guess	2006-02-22 23:58:31 UTC (rev 2776)
+++ branches/ocfs2-1.2/vendor/rhel4/kernel.guess	2006-02-23 21:52:35 UTC (rev 2777)
@@ -60,6 +60,32 @@
     fi
 }
 
+#
+# OCFS2 can only use RHEL4 U2 and newer
+#
+new_enough()
+{
+    KVER="$1"
+
+    #
+    # RHEL4 versions look like
+    #     2.6.9-<something>.EL<type>
+    # where <something> is a version string.  We really only care
+    # about the first number in it, which we'll call COUNTER.
+    #
+    EXTPART="${KVER#2.6.9-}"
+    EXTPART="${EXTPART%%.EL*}"
+    COUNTER="${EXTPART%%.*}"
+
+    # U2 is 22.EL
+    if [ -z "$COUNTER" -o "$COUNTER" -lt 22 ]
+    then
+        return 1
+    fi
+    
+    return 0
+}
+
 verfromdir()
 {
     TESTDIR="$1"
@@ -99,6 +125,11 @@
 {
     KVER="$1"
 
+    if ! new_enough "$KVER" 2>/dev/null
+    then
+        return
+    fi
+
     dir=$(guess_rhel4_dir "$KVER")
     if validate_dir "$KVER" "$dir"
     then
@@ -187,6 +218,10 @@
         esac
 
         KVER="$(verfromdir "${RHEL4_KERNEL_BASE}/${kdir}")"
+        if ! new_enough "$KVER" 2>/dev/null
+        then
+            continue
+        fi
         if ! validate_dir "$KVER" "$kdir"
         then
             continue

Modified: branches/ocfs2-1.2/vendor/sles9/kernel.guess
===================================================================
--- branches/ocfs2-1.2/vendor/sles9/kernel.guess	2006-02-22 23:58:31 UTC (rev 2776)
+++ branches/ocfs2-1.2/vendor/sles9/kernel.guess	2006-02-23 21:52:35 UTC (rev 2777)
@@ -82,6 +82,40 @@
     fi
 }
 
+#
+# OCFS2 can only use SLES9 SP3 and newer
+#
+new_enough()
+{
+    KVER="$1"
+
+    #
+    # SLES9 versions look like
+    #     2.6.5-7.<something>-<type
+    # or
+    #     2.6.5-7.<something>.<something else>-<type>
+    # We only care about "something", which we'll call COUNTER
+    #
+    EXTPART="${KVER#2.6.5-}"
+    EXTPART="${EXTPART%%-*}"
+    SEVEN="${EXTPART%%.*}"
+    EXTPART="${EXTPART#${SEVEN}.}"
+    COUNTER="${EXTPART%%.*}"
+
+    if [ -z "$SEVEN" -o "$SEVEN" -lt 7 ]
+    then
+        return 1
+    fi
+
+    # SP3 is 7.244
+    if [ -z "$COUNTER" -o "$COUNTER" -lt 244 ]
+    then
+        return 1
+    fi
+    
+    return 0
+}
+
 verfromdir()
 {
     TESTDIR="$1"
@@ -121,6 +155,11 @@
 {
     KVER="$1"
 
+    if ! new_enough "$KVER" 2>/dev/null
+    then
+        return
+    fi
+
     dir=`guess_sles9_dir "$KVER"`
     if validate_dir "$KVER" "$dir"
     then
@@ -193,6 +232,10 @@
     for type in $types
     do
         KVER="`verfromdir "${SLES9_KERNEL_BASE}/${kdir}/${ARCH}/${type}"`"
+        if ! new_enough "$KVER" 2>/dev/null
+        then
+            return 1
+        fi
         if ! validate_dir "$KVER" "$kdir/${ARCH}/${type}"
         then
             return 1
@@ -239,11 +282,6 @@
             then
                 KVER="${kdir#linux-}"
                 KVER="${KVER%-obj}"
-                if [ "$KVER" = "2.6.5-7.202.7" ]
-                then
-                    # This kernel is broken for OCFS2
-                    continue
-                fi
                 if rpm -q "kernel-syms-${KVER}" 1>/dev/null 2>&1
                 then
                     echo "sles9_${KVER}_rpm"