From: Sebastien Buisson <sbuisson@ddn.com>
Date: Fri, 12 Jul 2019 13:23:29 +0000 (+0200)
Subject: LU-12539 build: pass --with-o2ib when building deb packages
X-Git-Tag: 2.12.3-RC1~93
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F35828%2F2;p=fs%2Flustre-release.git

LU-12539 build: pass --with-o2ib when building deb packages

When building deb packages (make debs), '--with-o2ib' option is
not passed to ./configure called by package mechanism.
So Lustre deb packages are possibly built against wrong OFED headers.

Lustre-change: https://review.whamcloud.com/35481
Lustre-commit: 8d7f2674337e4f22e200e08ca1ac001ec24b4496

Test-Parameters: trivial
Test-Parameters: trivial clientdistro=ubuntu1804
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I9cd1db54e77b97f46c0e0bdfe35084f1a268b70b
Reviewed-on: https://review.whamcloud.com/35828
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/autoMakefile.am b/autoMakefile.am
index a542e12..dca2ca4 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -254,6 +254,10 @@ debs: undef.h
 		echo "SPL: $${SPL_SRC}"; \
 		echo "ZFS: $${ZFS_SRC}"; \
 	fi; \
+	if test "x@ENABLEO2IB@" != "xno"; then \
+		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} o2ib"; \
+		export O2IB_SRC="@O2IBPATH@"; \
+	fi; \
 	if test "x@ENABLE_GSS@" = "xyes"; then \
 		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} gss"; \
 	elif test "x@ENABLE_GSS@" = "xno"; then \
diff --git a/debian/rules b/debian/rules
index dbae257..01400e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -172,6 +172,9 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 	else \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-ldiskfs"; \
 	fi; \
+	if echo "$${DEB_BUILD_PROFILES}" | grep -q "o2ib"; then \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --with-o2ib=$${O2IB_SRC}"; \
+	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -qw "gss"; then \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --enable-gss"; \
 	elif echo "$${DEB_BUILD_PROFILES}" | grep -qw "nogss"; then \
@@ -455,6 +458,9 @@ kdist_config: prep-deb-files patch-stamp
 		export EXTRAFLAGS="$${EXTRAFLAGS} \
 			--disable-ldiskfs --disable-quilt"; \
 	fi; \
+	if echo "$${DEB_BUILD_PROFILES}" | grep -q "o2ib"; then \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --with-o2ib=$${O2IB_SRC}"; \
+	fi; \
 	echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
 	./configure --with-linux=$(KSRC_TREE) \
 		--with-linux-obj=$(KSRC) \