LU-8915 lnet: migrate LNet selftest session handling to Netlink

[fs/lustre-release.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index cbb4a5b..074b59a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ endif
 #export CC
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=9
+export DH_COMPAT=11
 
 # Module-assistant stuff
 ifneq (,$(findstring server,$(DEB_BUILD_PROFILES)))
@@ -199,6 +199,14 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
        elif echo "$${DEB_BUILD_PROFILES}" | grep -qw "nocrypto"; then \
                export EXTRAFLAGS="$${EXTRAFLAGS} --disable-crypto"; \
        fi; \
+       if [ -f "$${CONFIG_CACHE_FILE}" ]; then \
+               export TMP_CACHE_FILE=$$(mktemp); \
+               sed -e "/ac_cv_env/d" \
+                   -e "/am_cv_CC_dependencies_compiler_type/d" \
+                   -e "/lb_cv_mpi_tests/d" \
+                      "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \
+               export EXTRAFLAGS="$${EXTRAFLAGS} --cache-file=$${TMP_CACHE_FILE}"; \
+       fi; \
        echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
        ( cd $(BUILDDIR) && \
                $(SRCDIR)/configure --disable-dependency-tracking \
@@ -252,6 +260,7 @@ binary-$(UTILS_PKG): build-stamp
               debian/$(UTILS_PKG)/usr/bin/*-survey \
               debian/$(UTILS_PKG)/usr/bin/mcreate \
               debian/$(UTILS_PKG)/usr/bin/munlink \
+              debian/$(UTILS_PKG)/usr/bin/statx \
               debian/$(UTILS_PKG)/usr/sbin/wirecheck \
               debian/$(UTILS_PKG)/usr/sbin/wiretest
        dh_makeshlibs -p $(UTILS_PKG)
@@ -346,13 +355,14 @@ binary-$(SOURCE_PKG): build-stamp
              . debian/$(SOURCE_PKG)/usr/src/modules/lustre
        # Remove FULLCLEAN setting
        rm debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/rules
-       sed -e 's/FULLCLEAN=full-clean/FULLCLEAN=/' < debian/rules > debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/rules
+       cp -v debian/rules debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/rules
+       sed -i -e 's/FULLCLEAN=full-clean/FULLCLEAN=/' debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/rules
        # clean up dest
        rm -rf debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/patched \
               debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/patches/* 
        $(MAKE) -C debian/$(SOURCE_PKG)/usr/src/modules/lustre -f debian/rules clean
        # Create the module-source tarball.
-       cd debian/$(SOURCE_PKG)/usr/src && tar jcf lustre.tar.bz2 modules 
+       cd debian/$(SOURCE_PKG)/usr/src && tar --exclude-vcs -jcf lustre-$${SRC_GIT_HASH}.tar.bz2 modules
        rm -rf debian/$(SOURCE_PKG)/usr/src/modules
        dh_install -p$(SOURCE_PKG)
        dh_installchangelogs -p $(SOURCE_PKG) lustre/ChangeLog
@@ -485,6 +495,14 @@ kdist_config: prep-deb-files patch-stamp
        elif echo "$${DEB_BUILD_PROFILES}" | grep -qw "nocrypto"; then \
                export EXTRAFLAGS="$${EXTRAFLAGS} --disable-crypto"; \
        fi; \
+       if [ -f "$${CONFIG_CACHE_FILE}" ]; then \
+               export TMP_CACHE_FILE=$$(mktemp --tmpdir newconfig-XXXXXXXX.cache); \
+               sed -e "/ac_cv_env/d" \
+                   -e "/am_cv_CC_dependencies_compiler_type/d" \
+                   -e "/lb_cv_mpi_tests/d" \
+                      "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \
+               export EXTRAFLAGS="$${EXTRAFLAGS} --cache-file=$${TMP_CACHE_FILE}"; \
+       fi; \
        echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
        ./configure --with-linux=$(KSRC_TREE) \
                --with-linux-obj=$(KSRC) \
@@ -494,7 +512,7 @@ kdist_config: prep-deb-files patch-stamp
                --disable-snmp \
                --disable-tests \
                --enable-quota \
-               --with-kmp-moddir=updates/kernel \
+               --with-kmp-moddir=updates \
                $${EXTRAFLAGS} \
                $(EXTRA_OPTIONS)