From 2a107b4d32ce6973905aaab596028b7368b094b1 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Thu, 2 May 2024 16:20:49 +0700 Subject: [PATCH] LU-17791 build: use external o2ib path for ko2iblnd.ko The O2IBPATH variable was split into INT_O2IBPATH used for in-kernel o2iblnd and EXT_O2IBPATH for the external o2iblnd driver. Correct a case where the transtion from @O2IBPATH@ to @EXT_O2IBPATH@ was missed when support for multiple lnds deb packaging was initially added. Fixes: 95287378fab ("LU-16967 build: Separate lnet LND deb packaging") Signed-off-by: Shaun Tancheff Change-Id: I94ff393a437c6875cda9db266ab636fd88871188 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54984 Tested-by: jenkins Tested-by: Shuichi Ihara Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Jian Yu Reviewed-by: Shuichi Ihara Reviewed-by: Oleg Drokin --- autoMakefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am index 62b6556..11af92b 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -470,8 +470,8 @@ debs: undef.h debs_common export IB_OPTIONS="--with-o2ib=no"; \ else \ if test "x@ENABLEO2IB@" != "xyes" && \ - test -n "@O2IBPATH@"; then \ - export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \ + test -n "@EXT_O2IBPATH@"; then \ + export IB_OPTIONS="--with-o2ib=@EXT_O2IBPATH@"; \ else \ export IB_OPTIONS="--with-o2ib=yes"; \ fi; \ -- 1.8.3.1