LU-15160 kernel: kernel update SLES12 SP5 [4.12.14-122.91.2]

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

diff --git a/autoMakefile.am b/autoMakefile.am
index 84c3eb1..367e957 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
@@ -206,6 +208,9 @@ dkms-rpms: dkms-rpm
 
 rpms: srpm
        rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+       if test "x@CONFIG_CACHE_FILE@" != "x"; then \
+               export CONFIG_CACHE_FILE="@CONFIG_CACHE_FILE@"; \
+       fi; \
        $(MAKE) $(AM_MAKEFLAGS) \
                rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
        $(RPMBUILD) \
@@ -232,6 +237,7 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile
 # In the debs target, first make sure what's in the changelog reflects
 # the software version.
 debs: undef.h
+       cp -v debian/changelog.in debian/changelog ; \
        lversion=$$(echo @VERSION@ | tr '_' '-'); \
        cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
        if [ "$$lversion" != "$$cversion" ]; then \
@@ -258,6 +264,9 @@ debs: undef.h
                export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} o2ib"; \
                export O2IB_SRC="@O2IBPATH@"; \
        fi; \
+       if test "x@CONFIG_CACHE_FILE@" != "x"; then \
+               export CONFIG_CACHE_FILE="@CONFIG_CACHE_FILE@"; \
+       fi; \
        if test "x@ENABLE_GSS@" = "xyes"; then \
                export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} gss"; \
                debiantmp=$$(mktemp -t -d debbuild-$$USER-XXXXXXXX) ; \
@@ -265,7 +274,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"; \
@@ -336,6 +345,7 @@ debs: undef.h
           debs/
 
 dkms-debs: undef.h
+       cp -v debian/changelog.in debian/changelog ; \
        lversion=$$(echo @VERSION@ | tr '_' '-'); \
        cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
        if [ "$$lversion" != "$$cversion" ]; then \