Skip to content

Commit 213b760

Browse files
committed
perf tools: Don't install libtraceevent plugins as its not anymore in the kernel sources
While doing 'make -C tools/perf build-test' one can notice error messages while trying to install libtraceevent plugins, stop doing that as libtraceevent isn't anymore a homie. These are the warnings dealt with: make_install_prefix_slash_O: make install prefix=/tmp/krava/ failed to find: /tmp/krava/etc/bash_completion.d/perf failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_cfg80211.so failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_scsi.so failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_xen.so failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_function.so failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_sched_switch.so failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_mac80211.so failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_kvm.so failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_kmem.so failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_hrtimer.so failed to find: /tmp/krava/lib64/traceevent/plugins/plugin_jbd2.so Fixes: 4171925 ("tools lib traceevent: Remove libtraceevent") Acked-by: Ian Rogers <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Steven Rostedt <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent dce088a commit 213b760

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

tools/perf/Makefile.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,14 +1314,6 @@ tip_instdir_SQ = $(subst ','\'',$(tip_instdir))
13141314

13151315
export perfexec_instdir_SQ
13161316

1317-
# If we install to $(HOME) we keep the traceevent default:
1318-
# $(HOME)/.traceevent/plugins
1319-
# Otherwise we install plugins into the global $(libdir).
1320-
ifdef DESTDIR
1321-
plugindir=$(libdir)/traceevent/plugins
1322-
plugindir_SQ= $(subst ','\'',$(plugindir))
1323-
endif
1324-
13251317
print_var = $(eval $(print_var_code)) $(info $(MSG))
13261318
define print_var_code
13271319
MSG = $(shell printf '...%40s: %s' $(1) $($(1)))

tools/perf/tests/make

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -222,19 +222,7 @@ installed_files_bin := bin/perf
222222
installed_files_bin += etc/bash_completion.d/perf
223223
installed_files_bin += libexec/perf-core/perf-archive
224224

225-
installed_files_plugins := $(lib)/traceevent/plugins/plugin_cfg80211.so
226-
installed_files_plugins += $(lib)/traceevent/plugins/plugin_scsi.so
227-
installed_files_plugins += $(lib)/traceevent/plugins/plugin_xen.so
228-
installed_files_plugins += $(lib)/traceevent/plugins/plugin_function.so
229-
installed_files_plugins += $(lib)/traceevent/plugins/plugin_sched_switch.so
230-
installed_files_plugins += $(lib)/traceevent/plugins/plugin_mac80211.so
231-
installed_files_plugins += $(lib)/traceevent/plugins/plugin_kvm.so
232-
installed_files_plugins += $(lib)/traceevent/plugins/plugin_kmem.so
233-
installed_files_plugins += $(lib)/traceevent/plugins/plugin_hrtimer.so
234-
installed_files_plugins += $(lib)/traceevent/plugins/plugin_jbd2.so
235-
236225
installed_files_all := $(installed_files_bin)
237-
installed_files_all += $(installed_files_plugins)
238226

239227
test_make_install := $(call test_dest_files,$(installed_files_all))
240228
test_make_install_O := $(call test_dest_files,$(installed_files_all))

0 commit comments

Comments
 (0)