From 86274f9e1979e3da69952b2e7f5058e202dffb28 Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Mon, 2 Mar 2015 17:47:34 +0800 Subject: [PATCH 1/1] LU-6323 build: fix debian to compile with external IB Debian seems compiling with fixed configurations, if users want to make debian package with external IB, it won't work. Signed-off-by: Wang Shilong Change-Id: I0ecb5c79d5948c0e8ab821c175ca89afee9cb97d Reviewed-on: http://review.whamcloud.com/13949 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Blake Caldwell Reviewed-by: Li Xi Reviewed-by: Oleg Drokin --- autoMakefile.am | 2 ++ debian/rules | 4 +++- lnet/autoconf/lustre-lnet.m4 | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/autoMakefile.am b/autoMakefile.am index 1a61ae7..c6aff1f 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -141,6 +141,8 @@ debs: echo "lustre" > usr_share_modass/compliant.list && \ export MA_DIR=$$(pwd)/usr_share_modass && \ KVERS=$${KVERS:-$(LINUXRELEASE)} && \ + [ "x@ENABLEO2IB@" != "x" ] && \ + export IB_OPTIONS="--with-o2ib=@O2IBPATHS@" && \ export KSRC_TREE=$(LINUX) && \ KSRC=$${KSRC:-$(LINUX_OBJ)} && \ m-a build $${KSRC:+-k $$KSRC} $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \ diff --git a/debian/rules b/debian/rules index bef0c49..f9df441 100755 --- a/debian/rules +++ b/debian/rules @@ -54,6 +54,7 @@ KVER?=$(LINUXRELEASE) KVERS?=$(KVER) KSRC?=$(LINUX_OBJ) KSRC_TREE?=$(LINUX) +IB_OPTIONS?="" # Packages PATCH_PKG=linux-patch-lustre @@ -344,7 +345,8 @@ kdist_config: prep-deb-files patch-stamp --disable-iokit \ --disable-snmp \ --disable-tests \ - --enable-quota + --enable-quota \ + $(IB_OPTIONS) kdist_configure: kdist_config diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index b35d3a7..2d2c2f0 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -325,6 +325,8 @@ directory which is likely in ${O2IBPATH%-*} ]) AC_SUBST(EXTRA_OFED_INCLUDE) AC_SUBST(O2IBLND) +AC_SUBST(O2IBPATHS) +AC_SUBST(ENABLEO2IB) # In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument AS_IF([test $ENABLEO2IB != "no"], [ -- 1.8.3.1