From: Ake Sandgren <ake.sandgren@hpc2n.umu.se>
Date: Wed, 21 Nov 2018 18:00:53 +0000 (+0100)
Subject: LU-11541 build: Use correct kernel version for DKMS MLNX OFED.
X-Git-Tag: 2.12.0-RC1~12
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=cad65d162273daf67ce9106897430faadb3ad5f6

LU-11541 build: Use correct kernel version for DKMS MLNX OFED.

Check for $O2IBPATHS/${LINUXRELEASE} before $O2IBPATHS/default.
The "default" link is only created on the first dkms build of OFED.
So if doing dkms build for another kernel it may not be pointing
to the correct kernel.

Test-Parameters: trivial

Signed-off-by: Ake Sandgren <ake.sandgren@hpc2n.umu.se>
Change-Id: If8054ee64cf8795ed0e3ee50a8ef9ced067059d7
Reviewed-on: https://review.whamcloud.com/33702
Tested-by: Jenkins
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index f5b084a4..4ea62ad 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -129,7 +129,9 @@ If you still want to build Lustre for your OFED I/B stack, you need to install a
 Instead, if you want to build Lustre for your kernel's built-in I/B stack rather than your installed OFED stack, either remove the OFED package(s) or use --with-o2ib=no.
 					     ])
 			])
-			if test -e $O2IBPATHS/default; then
+			if test -e $O2IBPATHS/${LINUXRELEASE}; then
+			    O2IBPATHS=$O2IBPATHS/${LINUXRELEASE}
+			elif test -e $O2IBPATHS/default; then
 			    O2IBPATHS=$O2IBPATHS/default
 			fi
 			OFED="yes"