X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=autoMakefile.am;h=a542e12575c196aea8144e7abbc3354a142aeb88;hb=befb09ba10f6b801021ec563e976f21fd68cd8e7;hp=92aa7c4bf92c46e4bb4318af987d2bf1e2cd2fa3;hpb=a543b127b3e50ed318a0f03ca3f3fccae7dfe3ba;p=fs%2Flustre-release.git diff --git a/autoMakefile.am b/autoMakefile.am index 92aa7c4..a542e12 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -264,6 +264,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}; \ @@ -284,16 +294,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 && \