[linux] 03/07: linux-perf: Add build-time check for unversioned files that are likely to result in file conflicts

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit f0398f7ebef0e7d4fe384f37bda9ece2bdce0b6b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Apr 28 15:53:34 2016 +0200

    linux-perf: Add build-time check for unversioned files that are likely to result in file conflicts
    
    See #813080, #821741, etc.
---
 debian/changelog                   | 2 ++
 debian/rules.d/tools/perf/Makefile | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0e6613d..10d8cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -128,6 +128,8 @@ linux (4.5.2-1) UNRELEASED; urgency=medium
     Thierry Herbelot (Closes: #822666)
   * memcg: remove lru_add_drain_all() invocation from mem_cgroup_move_charge()
     (Closes: #822084)
+  * linux-perf: Add build-time check for unversioned files that are likely to
+    result in file conflicts
 
   [ Aurelien Jarno ]
   * [mips*] Emulate unaligned LDXC1 and SDXC1 instructions.
diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile
index 6813e83..5be6fa7 100644
--- a/debian/rules.d/tools/perf/Makefile
+++ b/debian/rules.d/tools/perf/Makefile
@@ -70,3 +70,5 @@ endif
 	mv $(DESTDIR)/etc/bash_completion.d \
 		$(DESTDIR)/usr/share/bash-completion/completions
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc
+# Check for unversioned files that are likely to result in file conflicts
+	! find $(DESTDIR) -name '*perf*' \! -path '*[_-]$(VERSION)*' | grep .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git