LU-6215 build: announce linux kernel 4.4.6 support

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

diff --git a/autoMakefile.am b/autoMakefile.am
index ed22c70..13a00de 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -95,16 +95,17 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec \
        build/Makefile                  \
        build/Rules.in                  \
        config.h.in                     \
-       undef.h                         \
        lustre-dkms_pre-build.sh        \
        lustre-dkms_post-build.sh       \
        LUSTRE-VERSION-GEN              \
-       LUSTRE-VERSION-FILE
+       LUSTRE-VERSION-FILE             \
+       undef.h
 
 # contrib is a directory.  Putting a directory in EXTRA_DIST
 # recursively includes the entire directory contents in the
 # distribution tarball (the tarball created with "make dist").
 EXTRA_DIST += contrib
+EXTRA_DIST += rpm
 
 rpm-local:
        @(if test -z "$(RPMBUILD)"; then \
@@ -170,6 +171,7 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile
        rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
        $(MAKE) $(AM_MAKEFLAGS) \
                rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+       cp $(top_srcdir)/rpm/* $(top_srcdir); \
        $(RPMBUILD) \
                --define "_tmppath $$rpmbuilddir/TMP" \
                --define "_topdir $$rpmbuilddir" \
@@ -180,16 +182,9 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile
        rm -rf $$rpmbuilddir
 
 # In the debs target, first make sure what's in the changelog reflects
-# the software version.  Here's how we could dig the version out of the
-# autoconf version file directly:
-# lversion=$$(sed -ne 's/m4_define(\[LUSTRE_[A-Z][A-Z]*\],\[\([0-9][0-9]*\)\])$$/\1/p'
-#      lustre/autoconf/lustre-version.ac | tr '\n' '.' | sed -e 's/.$//');
-#
-# However, one cannot really run "make debs" without having done a
-# configure first, so we could use the easier method of digging the
-# version out of the config.h file.
+# the software version.
 debs: undef.h
-       lversion=$$(sed -ne 's/^#define VERSION "\(.*\)"$$/\1/p' config.h); \
+       lversion=$$(echo @VERSION@ | tr '_' '-'); \
        cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
        if [ "$$lversion" != "$$cversion" ]; then \
                echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n  * Automated changelog entry update\n\n -- Brian J. Murrell <brian@interlinx.bc.ca>  $$(date -R)\n\n.\nwq" | ed debian/changelog; \