X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=contrib%2Flbuild%2Ffuncs.sh;h=2f864ae8ad90bad8243427767161421c568f169e;hb=b30930a242c6839c2cdb653c849838e928fc3936;hp=e57e5bf37421e1445f074cbe46b078657bb694a7;hpb=cb1609b32c21045655f7fe463d0c050c2667ebba;p=fs%2Flustre-release.git

diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh
index e57e5bf..2f864ae 100644
--- a/contrib/lbuild/funcs.sh
+++ b/contrib/lbuild/funcs.sh
@@ -138,12 +138,18 @@ autodetect_distro() {
             "RedHatEnterpriseServer" | "ScientificSL" | "CentOS")
                 name="rhel"
                 ;;
-            "SUSE LINUX")
-                name="sles"
-		PATCHLEVEL=$(sed -n -e 's/^PATCHLEVEL = //p' /etc/SuSE-release)
-		if [ "$PATCHLEVEL" -ne "0" ]; then
-			version="${version}.$PATCHLEVEL"
-		fi
+	    "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"
@@ -184,19 +190,14 @@ autodetect_target() {
 
     local target=""
     case ${distro} in
-          oel5*)  target="2.6-oel5";;
-         rhel5*)  target="2.6-rhel5";;
-         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";;
+         rhel8*)  target="4.18-rhel8";;
         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";;
+        sles12.4) target="$(uname -r | cut -d . -f 1,2)-sles12sp4";;
+        sles12.3) target="$(uname -r | cut -d . -f 1,2)-sles12sp3";;
+        sles12*)  target="$(uname -r | cut -d . -f 1,2)-sles12";;
           fc18)   target="3.x-fc18";;
              *)   fatal 1 "I don't know what distro $distro is.\nEither update autodetect_target() or use the --target argument.";;
     esac