LU-6862 build: Make dist of contrib's contents consistent

Authors and reviewers of patches adding things to the contrib
subdirectory have been inconsistent with the inclusion of the
contrib tree's contents in the distribution tarball.

This patch fixes that by removing all of the Makefiles from the
contrib tree, and instead just listing contrib in EXTRA_DIST
at the top level.  That will recursively include the entire
contrib directory in the distribution tarball.  This way
there is little oportunity for inclusion of files under
contrib being inconsistent.

Change-Id: If6b92ed069a3fbeb1d0a8c8c0488180ee69597f3
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/15629
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Brian J. Murrell <brian.murrell@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/autoMakefile.am b/autoMakefile.am
index 0943370..70a967e 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -12,7 +12,7 @@ DIST_SUBDIRS := ldiskfs \
        @SNMP_DIST_SUBDIR@ \
        lnet \
        lustre \
        @SNMP_DIST_SUBDIR@ \
        lnet \
        lustre \

-       config contrib
+       config

 
 AUTOMAKE_OPTIONS = foreign
 
 
 AUTOMAKE_OPTIONS = foreign
 


@@ -104,6 +104,11 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec        \
        LUSTRE-VERSION-GEN              \
        LUSTRE-VERSION-FILE
 
        LUSTRE-VERSION-GEN              \
        LUSTRE-VERSION-FILE
 

+# 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
+

 rpm-local:
        @(if test -z "$(RPMBUILD)"; then \
                echo -e "\n" \
 rpm-local:
        @(if test -z "$(RPMBUILD)"; then \
                echo -e "\n" \

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 459b54c..950c1c4 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -360,9 +360,6 @@ AC_DEFUN([LB_CONFIG_FILES], [
                [Rules:build/Rules.in]
                AC_PACKAGE_TARNAME[.spec]
                AC_PACKAGE_TARNAME[-dkms.spec]
                [Rules:build/Rules.in]
                AC_PACKAGE_TARNAME[.spec]
                AC_PACKAGE_TARNAME[-dkms.spec]

-               contrib/Makefile
-               contrib/lbuild/Makefile
-               contrib/scripts/Makefile

                ldiskfs/Makefile
                ldiskfs/autoMakefile
                lustre-iokit/Makefile
                ldiskfs/Makefile
                ldiskfs/autoMakefile
                lustre-iokit/Makefile

diff --git a/contrib/.gitignore b/contrib/.gitignore
deleted file mode 100644 (file)
index 70845e0..0000000
--- a/contrib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.in

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644 (file)
index d48d6bf..0000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = rdac_spec patches
-DIST_SUBDIRS = lbuild scripts

diff --git a/contrib/lbuild/Makefile.am b/contrib/lbuild/Makefile.am
deleted file mode 100644 (file)
index 5615cd0..0000000
--- a/contrib/lbuild/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = lbuild
-EXTRA_DIST += lbuild-fc lbuild-fc11 lbuild-fc12 lbuild-fc15
-EXTRA_DIST += lbuild-rhel lbuild-rhel5 lbuild-rhel6 lbuild-rhel7
-EXTRA_DIST += lbuild-sles lbuild-sles10 lbuild-sles11 lbuild-sles12
-EXTRA_DIST += funcs.sh exit_traps.sh find_linux_rpms

diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am
deleted file mode 100644 (file)
index 136a191..0000000
--- a/contrib/scripts/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = update_oldconfig