LU-13988 mdt: ASSERTION(!lustre_handle_is_used(&lh->mlh_reg_lh)) failed

[fs/lustre-release.git] / autoMakefile.am

diff --git a/autoMakefile.am b/autoMakefile.am
index 84c3eb1..0c2a878 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,15 +1,15 @@
 SUBDIRS := @LDISKFS_SUBDIR@ \
        . \
        @LUSTREIOKIT_SUBDIR@ \
-       @SNMP_SUBDIR@ \
        libcfs \
+       @SNMP_SUBDIR@ \
        lnet \
        lustre
 
 DIST_SUBDIRS := ldiskfs \
        lustre-iokit \
-       @SNMP_DIST_SUBDIR@ \
        libcfs \
+       @SNMP_DIST_SUBDIR@ \
        lnet \
        lustre \
        config
@@ -101,7 +101,9 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec \
        lustre-dkms_post-build.sh       \
        LUSTRE-VERSION-GEN              \
        LUSTRE-VERSION-FILE             \
-       undef.h
+       undef.h                         \
+       autogen.sh                      \
+       config/lustre-version.m4
 
 # contrib is a directory.  Putting a directory in EXTRA_DIST
 # recursively includes the entire directory contents in the
@@ -265,7 +267,7 @@ debs: undef.h
                cp debian/control.main $$debiantmp/control.main.bkp ; \
                cp debian/control.modules.in $$debiantmp/control.modules.in.bkp ; \
                sed -i "s+^\(Build-Depends: .*\)$$+\1, libkrb5-dev, libssl-dev+" debian/control.main ; \
-               awk 'BEGIN{change=0} $$1 == "Package:" {if (($$2 == "lustre-client-utils") || ($$2 == "lustre-server-utils")) change=1; else change=0; fi } {if (($$1 == "Depends:") && change) print $$0 ", libgssapi-krb5-2, libkrb5-3, libssl1.1+"; else print; fi}' debian/control.main > $$debiantmp/control.main && mv $$debiantmp/control.main debian/control.main ; \
+               awk 'BEGIN{change=0} $$1 == "Package:" {if (($$2 == "lustre-client-utils") || ($$2 == "lustre-server-utils")) change=1; else change=0; fi } {if (($$1 == "Depends:") && change) print $$0 ", libgssapi-krb5-2, libkrb5-3, libssl1.1"; else print; fi}' debian/control.main > $$debiantmp/control.main && mv $$debiantmp/control.main debian/control.main ; \
                sed -i "s+^\(Build-Depends: .*\)$$+\1, libkrb5-dev, libssl-dev+" debian/control.modules.in ; \
        elif test "x@ENABLE_GSS@" = "xno"; then \
                export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nogss"; \