From 8d7f2674337e4f22e200e08ca1ac001ec24b4496 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Fri, 12 Jul 2019 15:23:29 +0200 Subject: [PATCH] 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. Test-Parameters: trivial Test-Parameters: trivial clientdistro=ubuntu1804 Signed-off-by: Sebastien Buisson Change-Id: I9cd1db54e77b97f46c0e0bdfe35084f1a268b70b Reviewed-on: https://review.whamcloud.com/35481 Tested-by: jenkins Reviewed-by: Patrick Farrell Tested-by: Maloo Reviewed-by: Nathaniel Clark Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- autoMakefile.am | 4 ++++ debian/rules | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/autoMakefile.am b/autoMakefile.am index ebf2dca..064c317 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 3c2bdbe..33f7878 100755 --- a/debian/rules +++ b/debian/rules @@ -186,6 +186,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 \ @@ -469,6 +472,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) \ -- 1.8.3.1