In order to simplify downstream distro packagers lives, add a new
.distignore.downstream file.  The purpose of this file is to list any
downstream-specific files that are part of the git tree but are _not_
part of the actual distributed files.

For example, a downstream maintainer could list there all downstream
specific CI files that are included in the downstream fork of the
project.

Reported-at: https://redhat.atlassian.net/browse/FDP-4723
Signed-off-by: Dumitru Ceara <[email protected]>
---
 .distignore.downstream | 0
 .gitignore             | 1 +
 Makefile.am            | 7 +++++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .distignore.downstream

diff --git a/.distignore.downstream b/.distignore.downstream
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.gitignore b/.gitignore
index 6e9e5c578d..20feb8feec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@
 /depcomp
 /distfiles
 /dist-docs
+/filtered-gitfiles
 /flake8-check
 /docs-check
 /install-sh
diff --git a/Makefile.am b/Makefile.am
index 8a9bf1e910..1b5800659d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -218,8 +218,11 @@ dist-hook-git: distfiles
            grep -v '\.gitattributes$$' | \
            grep -v '\.gitmodules$$' | \
            grep -v "$(submodules)" | \
+           grep -v "\.distignore.downstream$$" | \
            LC_ALL=C sort -u > all-gitfiles; \
-         LC_ALL=C comm -1 -3 distfiles all-gitfiles > missing-distfiles; \
+         LC_ALL=C comm -2 -3 all-gitfiles .distignore.downstream \
+           > filtered-gitfiles; \
+         LC_ALL=C comm -1 -3 distfiles filtered-gitfiles > missing-distfiles; \
          if test -s missing-distfiles; then \
            echo "The following files are in git but not the distribution:"; \
            cat missing-distfiles; \
@@ -231,7 +234,7 @@ dist-hook-git: distfiles
            exit 1; \
          fi \
        fi
-CLEANFILES += distfiles all-gitfiles missing-distfiles
+CLEANFILES += distfiles all-gitfiles filtered-gitfiles missing-distfiles
 # The following is based on commands for the Automake "distdir" target.
 distfiles: Makefile
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-- 
2.56.0

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to