diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-08 08:03:32 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-08 08:03:32 +0200 |
commit | 8331bd9c45cea3b4964b0a5fa301b375683fe103 (patch) | |
tree | 3b3dc12efe463a38ac1fe43fce4fe96efb1dffff /linux-kernel-test.patch | |
parent | ea76eb012e00670a95288a24263d4f29e06b266f (diff) | |
parent | 7ab3430578bb44245900b015eefd4644be051cfe (diff) | |
download | kernel-8331bd9c45cea3b4964b0a5fa301b375683fe103.tar.gz kernel-8331bd9c45cea3b4964b0a5fa301b375683fe103.tar.xz kernel-8331bd9c45cea3b4964b0a5fa301b375683fe103.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc0.20210707git77d34a4683b0.12.vanilla.1.fc35kernel-5.14.0-0.rc0.20210707git77d34a4683b0.12.vanilla.1.fc34kernel-5.14.0-0.rc0.20210707git77d34a4683b0.12.vanilla.1.fc33
Diffstat (limited to 'linux-kernel-test.patch')
-rw-r--r-- | linux-kernel-test.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/linux-kernel-test.patch b/linux-kernel-test.patch index 86c1ebd9b..e69de29bb 100644 --- a/linux-kernel-test.patch +++ b/linux-kernel-test.patch @@ -1,33 +0,0 @@ -From 5cfc0690eefcc30f880f0c02863a35d63b6c733c Mon Sep 17 00:00:00 2001 -From: "Justin M. Forbes" <jforbes@fedoraproject.org> -Date: Tue, 6 Jul 2021 13:50:10 -0500 -Subject: [PATCH] Fix the perf trace link location - -The install perf_dlfilter.h patch included what seems to be -a typo in the Makefile.perf, which changed the location of the trace -link from '$(DESTDIR_SQ)$(bindir_SQ)/trace' to -'$(DESTDIR_SQ)$(dir_SQ)/trace' This reverts it back to the correct -location. - -Fixes: 0beb218315e06 ("perf build: Install perf_dlfilter.h") -Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org> ---- - tools/perf/Makefile.perf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf -index c9e0de5b00c1..a1b9be78a1e0 100644 ---- a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -923,7 +923,7 @@ install-tools: all install-gtk - $(call QUIET_INSTALL, binaries) \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \ - $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \ -- $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(dir_SQ)/trace'; \ -+ $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'; \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(includedir_SQ)/perf'; \ - $(INSTALL) util/perf_dlfilter.h -t '$(DESTDIR_SQ)$(includedir_SQ)/perf' - ifndef NO_PERF_READ_VDSO32 --- -2.31.1 - |