Whamcloud - gitweb
LU-4196 build: Reenable OFED-3.5 support on SLES11 84/8884/7
authorJames Simmons <uja.ornl@gmail.com>
Wed, 12 Feb 2014 16:43:15 +0000 (11:43 -0500)
committerOleg Drokin <oleg.drokin@intel.com>
Fri, 21 Feb 2014 17:02:23 +0000 (17:02 +0000)
With the merger of LU-4266 support for SLES11 with
OFED-3.5 was accidentally removed. This patch restores
this support.

Change-Id: If70a8815d90e7d1fa998ba82c4dac5a384216353
Signed-off-by: James Simmons <uja.ornl@gmail.com>
Reviewed-on: http://review.whamcloud.com/8884
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lnet/autoconf/lustre-lnet.m4

index 1d994ae..2d119e3 100644 (file)
@@ -339,12 +339,17 @@ else
                                . $O2IBPATH/ofed_patch.mk
                        fi
                else
-                       case $RHEL_KERNEL_VERSION in
-                               2.6.32-358*)
-                                       EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4";;
-                               2.6.32-431*)
-                                       EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_5";;
-                       esac
+                       if test x$RHEL_KERNEL = xyes; then
+                               case $RHEL_KERNEL_VERSION in
+                                       2.6.32-358*)
+                                               EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4";;
+                                       2.6.32-431*)
+                                               EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_5";;
+                               esac
+                       elif test x$SUSE_KERNEL = xyes; then
+                               SP=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
+                               EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_SLES_11_$SP"
+                       fi
                fi
                AC_MSG_CHECKING([whether to use any OFED backport headers])
                if test -n "$BACKPORT_INCLUDES"; then