LU-11071 build: use --with-linux-obj for ubuntu

We can use --with-linux-obj instead of --with-linux-config
the config will be found just under LINUX_OBJ.
Otherwise the configure could fail if LINUX and LINUX_OBJ
are different paths. e.g. ubuntu18

Test-Parameters: trivial
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Change-Id: Ibaa159e5611c4054b3987da0ce3a8bca2992e057
Reviewed-on: https://review.whamcloud.com/33145
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Tested-by: Maloo <maloo@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 7e1bef3..d39d16a 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -259,11 +259,11 @@ debs: undef.h
        elif test "x@ENABLE_GSS@" = "xno"; then \
                export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nogss"; \
        fi; \
-       export KERNEL_CFG="$(LINUX_CONFIG)"; \
+       export KERNEL_OBJ="$(LINUX_OBJ)"; \
        export KERNEL_SRC="$(LINUX)"; \
        echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \
        echo "Kernel Source: $${KERNEL_SRC}"; \
-       echo "Kernel Config: $${KERNEL_CFG}"; \
+       echo "Kernel Object: $${KERNEL_OBJ}"; \
        dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
                rc=$${PIPESTATUS[0]}; \
                [ $${rc} -gt 1 ] && exit $${rc}; \
@@ -318,11 +318,11 @@ dkms-debs: undef.h
        fi; \
        rm -rf debs; \
        export DEB_BUILD_PROFILES="client"; \
-       export KERNEL_CFG="$(LINUX_CONFIG)"; \
+       export KERNEL_OBJ="$(LINUX_OBJ)"; \
        export KERNEL_SRC="$(LINUX)"; \
        echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \
        echo "Kernel Source: $${KERNEL_SRC}"; \
-       echo "Kernel Config: $${KERNEL_CFG}"; \
+       echo "Kernel Object: $${KERNEL_OBJ}"; \
        export BUILD_DKMS="true" && \
        dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
                rc=$${PIPESTATUS[0]}; \

diff --git a/debian/rules b/debian/rules
index 216d766..d7b0ea3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -142,7 +142,7 @@ autogen-stamp: patch-stamp
 # modules, whereas the modules build omits the utilities, to create two
 # neatly separated debian files.
 #
-# Note: KERNEL_SRC, KERNEL_CFG, ZFS_SRC and SPL_SRC need to be set from the
+# Note: KERNEL_SRC, KERNEL_OBJ, ZFS_SRC and SPL_SRC need to be set from the
 # outside. This is done by "make debs". As such, invoking "debuild" or such
 # direct debian build tools will lead to a client-only build.
 configure: configure-stamp
@@ -181,7 +181,7 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
        ( cd $(BUILDDIR) && \
                $(SRCDIR)/configure --disable-dependency-tracking \
                        --with-linux=$${KERNEL_SRC} \
-                       --with-linux-config=$${KERNEL_CFG} \
+                       --with-linux-obj=$${KERNEL_OBJ} \
                        --disable-snmp \
                        --enable-quota \
                        $${EXTRAFLAGS} \