Whamcloud - gitweb
LU-17254 lnet: Fix ofed detection with specific kernel version
authorAurelien Degremont <adegremont@nvidia.com>
Tue, 7 Nov 2023 19:38:53 +0000 (11:38 -0800)
committerAndreas Dilger <adilger@whamcloud.com>
Thu, 9 Nov 2023 08:36:50 +0000 (08:36 +0000)
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 <adegremont@nvidia.com>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/53021
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Colin Faber <cfaber@ddn.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
lnet/autoconf/lustre-lnet.m4

index 367eb83..f69daf6 100644 (file)
@@ -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