LU-12282 build: export IB_OPTIONS before build

We need to export any option before dpkg-buildpackage

Test-Parameters: trivial

Change-Id: I683080e1872c8818ae9c391f5971b5e4488147a6
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/34843
Tested-by: Jenkins
Reviewed-by: Gu Zheng <gzheng@ddn.com>
Reviewed-by: Wang Shilong <wshilong@ddn.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/autoMakefile.am b/autoMakefile.am
index aeda751..ebf2dca 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -267,6 +267,16 @@ debs: undef.h
        echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \
        echo "Kernel Source: $${KERNEL_SRC}"; \
        echo "Kernel Object: $${KERNEL_OBJ}"; \
+       if test "x@ENABLEO2IB@" = "xno"; then \
+               export IB_OPTIONS="--with-o2ib=no"; \
+       else \
+               if test "x@ENABLEO2IB@" != "xyes" && \
+                  test -n "@O2IBPATH@"; then \
+                       export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \
+               else \
+                       export IB_OPTIONS="--with-o2ib=yes"; \
+               fi; \
+       fi; \
        dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
                rc=$${PIPESTATUS[0]}; \
                [ $${rc} -gt 1 ] && exit $${rc}; \
@@ -287,16 +297,6 @@ debs: undef.h
        echo "lustre" > usr_share_modass/compliant.list && \
        export MA_DIR=$$(pwd)/usr_share_modass && \
        KVERS=$${KVERS:-$(LINUXRELEASE)} && \
-       if test "x@ENABLEO2IB@" = "xno"; then \
-               export IB_OPTIONS="--with-o2ib=no"; \
-       else \
-               if test "x@ENABLEO2IB@" != "xyes" && \
-                  test -n "@O2IBPATH@"; then \
-                       export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \
-               else \
-                       export IB_OPTIONS="--with-o2ib=yes"; \
-               fi; \
-       fi; \
        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 e2bfbd1..3c2bdbe 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -199,6 +199,7 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
                        --disable-snmp \
                        --enable-quota \
                        $${EXTRAFLAGS} \
+                       $(EXTRA_OPTIONS) \
        ); \
        touch $@