From: Aurelien Degremont <adegremont@nvidia.com>
Date: Thu, 2 Nov 2023 10:55:30 +0000 (+0100)
Subject: LU-17254 lnet: Fix ofed detection with specific kernel version
X-Git-Tag: 2.15.59~7
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F52949%2F2;p=fs%2Flustre-release.git

LU-17254 lnet: Fix ofed detection with specific kernel version

Improve OFED configure step with LNET when the kernel version
is using special characters that could be interprated in regexp
mode.

This is not uncommon in Debian world to have '+' in kernel version.

Test-parameters: trivial
Change-Id: Ia3da59c74d8c2e59e16525dd50c7b83c2b5fada8
Signed-off-by: Aurelien Degremont <adegremont@nvidia.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52949
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index bda97a5..0100f19 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -89,7 +89,7 @@ case $with_o2ib in
 
 			if test -n "$O2IBDIR_PATH"; then
 				O2IBPATHS=$(find $O2IBDIR_PATH -name rdma_cm.h |
-					egrep "`uname -r`|default" |
+					grep -F -e "`uname -r`" -e default |
 					sed -e 's/\/include\/rdma\/rdma_cm.h//')
 			fi