X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=contrib%2Flbuild%2Ffuncs.sh;h=cd1be96f73de00ae585b148040bd669ec43a7710;hb=5f4ca70b2aa45174907d3924b63bd953180674fe;hp=d26f1bb1be64b52f672562dc44da29ff22f03407;hpb=1ba98baf8be1622464faca80ffaeec7a01a04978;p=fs%2Flustre-release.git

diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh
index d26f1bb..cd1be96 100644
--- 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,18 @@ 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.3) target="$(uname -r | cut -d . -f 1,2)-sles12sp3";;
+        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.";;