From aaa2152dc57f292a7c7d470ae0ee47bb546315db Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 18 Dec 2018 17:01:34 +0000 Subject: [PATCH] linux-perf: Fix build-time check for unversioned files The current check has never worked because the find -path predicate matches against the whole path, including the given root. In this case that is $DESTDIR which always includes the version string. Change to use cd before find. Also, check all non-directories rather than all entries with "perf" in the name. --- debian/changelog | 4 ++++ debian/rules.d/tools/perf/Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 70540a317..c08ebe27d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ linux (4.19.9-2) UNRELEASED; urgency=medium + [ Uwe Kleine-König ] * [arm] Fix probing of 3rd gpio device on Armada 370. + [ Ben Hutchings ] + * linux-perf: Fix build-time check for unversioned files + -- Uwe Kleine-König Mon, 17 Dec 2018 11:27:32 +0100 linux (4.19.9-1) unstable; urgency=medium diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile index 90a497a45..41e07feb1 100644 --- a/debian/rules.d/tools/perf/Makefile +++ b/debian/rules.d/tools/perf/Makefile @@ -76,6 +76,6 @@ endif $(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 . + cd $(DESTDIR) && ! find \! -type d \! -path '*[_-]$(VERSION)*' | grep . endif # !nopython