aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2018-12-18 17:18:46 +0000
committerBen Hutchings <ben@decadent.org.uk>2018-12-18 17:20:51 +0000
commitd19f7ed1a4926106bee3a110e3763ba64926f7a8 (patch)
treee6fdb4721798986d821797b7334870a45a39330f
parentaaa2152dc57f292a7c7d470ae0ee47bb546315db (diff)
downloadkernel_replicant_linux-d19f7ed1a4926106bee3a110e3763ba64926f7a8.tar.gz
kernel_replicant_linux-d19f7ed1a4926106bee3a110e3763ba64926f7a8.tar.bz2
kernel_replicant_linux-d19f7ed1a4926106bee3a110e3763ba64926f7a8.zip
linux-perf: Fix installation directories for BPF headers and examples
Closes: #916774
-rw-r--r--debian/changelog2
-rw-r--r--debian/rules.d/tools/perf/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c08ebe27d305..e36bd627cf29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ linux (4.19.9-2) UNRELEASED; urgency=medium
[ Ben Hutchings ]
* linux-perf: Fix build-time check for unversioned files
+ * linux-perf: Fix installation directories for BPF headers and examples
+ (Closes: #916774)
-- Uwe Kleine-König <ukleinek@debian.org> Mon, 17 Dec 2018 11:27:32 +0100
diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile
index 41e07feb1c92..35de916c871b 100644
--- a/debian/rules.d/tools/perf/Makefile
+++ b/debian/rules.d/tools/perf/Makefile
@@ -22,7 +22,7 @@ MAKE_PERF := $(MAKE) O=$(CURDIR) prefix=/usr V=1 VF=1 ARCH=$(KERNEL_ARCH) WERROR
MAKE_PERF += NO_GTK2=1
# Include version in all directory names
-MAKE_PERF += perfexecdir=lib/perf_$(VERSION)-core plugindir=/usr/lib/traceevent_$(VERSION)/plugins STRACE_GROUPS_DIR=share/perf_$(VERSION)-core/strace/groups tipdir=share/doc/linux-perf-$(VERSION)
+MAKE_PERF += perfexecdir=lib/perf_$(VERSION)-core plugindir=/usr/lib/traceevent_$(VERSION)/plugins STRACE_GROUPS_DIR=share/perf_$(VERSION)-core/strace/groups tipdir=share/doc/linux-perf-$(VERSION) perf_include_dir=include/perf_$(VERSION) perf_examples_dir=share/doc/linux-perf-$(VERSION)/examples
# perf can link against libbfd if available, but the result is
# undistributable as they are licenced under GPL v2 and v3+