From c836da75e8f2c7284b695e2fd16a1cd6290dbcaa Mon Sep 17 00:00:00 2001 From: Aurelien Degremont Date: Tue, 7 Nov 2023 11:38:53 -0800 Subject: [PATCH] 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. Lustre-change: https://review.whamcloud.com/52949 Lustre-commit: b83156304df2d418aadb5d3dfd5f570ef72a7e2e Test-parameters: trivial Change-Id: Ia3da59c74d8c2e59e16525dd50c7b83c2b5fada8 Signed-off-by: Aurelien Degremont Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/53021 Reviewed-by: Andreas Dilger Reviewed-by: Colin Faber Tested-by: jenkins Tested-by: Maloo --- lnet/autoconf/lustre-lnet.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 367eb83..f69daf6 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -104,7 +104,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 -- 1.8.3.1