X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=d39d16aa70308a1a6eafec92a4f2c14279ea4796;hp=8460b6bdc90a829d25d1f87dda2aa2aecba386a6;hb=c648f5ddc3e84705df02b43d202d794fde93e3a6;hpb=e0aa1c6880f5423adfa9fa024f31990331041c67 diff --git a/autoMakefile.am b/autoMakefile.am index 8460b6b..d39d16a 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -254,11 +254,16 @@ debs: undef.h echo "SPL: $${SPL_SRC}"; \ echo "ZFS: $${ZFS_SRC}"; \ fi; \ - export KERNEL_CFG="$(LINUX_CONFIG)"; \ + if test "x@ENABLE_GSS@" = "xyes"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} gss"; \ + elif test "x@ENABLE_GSS@" = "xno"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nogss"; \ + fi; \ + 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}; \ @@ -313,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]}; \ @@ -333,9 +338,7 @@ dkms-debs: undef.h ../lustre_$${VER}.tar.gz ../lustre-*-modules-dkms_$${VER}_*.deb \ debs/ -if USES_DPKG EXTRA_DIST += debian/* -endif CSTK=/tmp/checkstack CSTKO=/tmp/checkstack.orig