From 9ea9b40b5cc9738a17bd059a2d7ed1d45dce9755 Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@fedoraproject.org>
Date: May 20 2021 14:52:49 +0000
Subject: More changes for dynamic libtraceevent


Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

---

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 530eb94..7888454 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -227,7 +227,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" tools/ tools/perf/scripts/pyth
 cd linux-%{kversion}
 
 %global perf_make \
-  make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 CORESIGHT=1 prefix=%{_prefix}
+  make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 CORESIGHT=1 prefix=%{_prefix}
 %global perf_python3 -C tools/perf PYTHON=%{__python3}
 # perf
 # make sure check-headers.sh is executable
@@ -299,7 +299,7 @@ popd
 cd linux-%{kversion}
 
 # perf tool binary and supporting scripts/binaries
-%{perf_make} %{perf_python3} DESTDIR=%{buildroot} lib=%{_lib} install-bin install-traceevent-plugins
+%{perf_make} %{perf_python3} DESTDIR=%{buildroot} lib=%{_lib} install-bin
 # remove the 'trace' symlink.
 rm -f %{buildroot}%{_bindir}/trace
 
@@ -388,8 +388,7 @@ popd
 
 %files -n perf
 %{_bindir}/perf
-%dir %{_libdir}/traceevent
-%{_libdir}/traceevent/plugins/
+%exclude %{_libdir}/traceevent
 %{_libdir}/libperf-jvmti.so
 %{_libexecdir}/perf-core
 %{_datadir}/perf-core/