LU-9236 kernel: new kernel RHEL 6.9 [2.6.32-696.el6]

[fs/lustre-release.git] / contrib / lbuild / funcs.sh

diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh
index d26f1bb..91b6f49 100644 (file)
--- a/contrib/lbuild/funcs.sh
+++ b/contrib/lbuild/funcs.sh
@@ -138,11 +138,19 @@ autodetect_distro() {
             "RedHatEnterpriseServer" | "ScientificSL" | "CentOS")
                 name="rhel"
                 ;;
-            "SUSE LINUX")
-                name="sles"
-                PATCHLEVEL=$(sed -n -e 's/^PATCHLEVEL = //p' /etc/SuSE-release)
-                version="${version}.$PATCHLEVEL"
-                ;;
+           "SUSE LINUX" | "SUSE")
+               name="sles"
+               case "$version" in
+               *.*)    # $version already has patchlevel
+                       ;;
+               *)      # add patchlevel
+                       PATCHLEVEL=$(sed -n -e 's/^PATCHLEVEL = //p' /etc/SuSE-release)
+                       if [ "$PATCHLEVEL" -ne "0" ]; then
+                               version="${version}.$PATCHLEVEL"
+                       fi
+                       ;;
+               esac
+               ;;
             "Fedora")
                 name="fc"
                 ;;
@@ -156,8 +164,10 @@ autodetect_distro() {
         if [ -f /etc/SuSE-release ]; then
             name=sles
             version=$(sed -n -e 's/^VERSION = //p' /etc/SuSE-release)
-            PATCHLEVEL=$(sed -n -e 's/^PATCHLEVEL = //p' /etc/SuSE-release)
-            version="${version}.$PATCHLEVEL"
+           PATCHLEVEL=$(sed -n -e 's/^PATCHLEVEL = //p' /etc/SuSE-release)
+           if [ "$PATCHLEVEL" -ne "0" ]; then
+                   version="${version}.$PATCHLEVEL"
+           fi
         elif [ -f /etc/redhat-release ]; then
             #name=$(head -1 /etc/redhat-release)
             name=rhel
@@ -182,12 +192,17 @@ autodetect_target() {
     case ${distro} in
           oel5*)  target="2.6-oel5";;
          rhel5*)  target="2.6-rhel5";;
+         rhel6.9) target="2.6-rhel6.9";;
+         rhel6.8) target="2.6-rhel6.8";;
+         rhel6.7) target="2.6-rhel6.7";;
          rhel6.6) target="2.6-rhel6.6";;
          rhel6*)  target="2.6-rhel6";;
          rhel7*)  target="3.10-rhel7";;
         sles10*)  target="2.6-sles10";;
+        sles11.4) target="$(uname -r | cut -d . -f 1,2)-sles11sp4";;
         sles11.3) target="$(uname -r | cut -d . -f 1,2)-sles11sp3";;
         sles11*)  target="$(uname -r | cut -d . -f 1,2)-sles11";;
+       sles12*)  target="$(uname -r | cut -d . -f 1,2)-sles12";;
           fc15)   target="2.6-fc15";;
           fc18)   target="3.x-fc18";;
              *)   fatal 1 "I don't know what distro $distro is.\nEither update autodetect_target() or use the --target argument.";;