From 23239454fce857b48b8b209cb8a607b6aa5b5272 Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@fedoraproject.org>
Date: Feb 21 2022 20:50:54 +0000
Subject: Fix up perf build


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

---

diff --git a/kernel-tools.spec b/kernel-tools.spec
index c471027..99c2b58 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -72,7 +72,7 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel
 BuildRequires: zlib-devel binutils-devel newt-devel python3-docutils perl(ExtUtils::Embed) bison flex xz-devel
 BuildRequires: audit-libs-devel glibc-devel glibc-headers glibc-static python3-devel java-devel
 BuildRequires: asciidoc xmlto libcap-devel
-BuildRequires: opencsd-devel openssl-devel libbabeltrace-devel libtraceevent-devel
+BuildRequires: openssl-devel libbabeltrace-devel
 BuildRequires: libbpf-devel
 BuildRequires: clang llvm
 # Used to mangle unversioned shebangs to be Python 3
@@ -80,6 +80,9 @@ BuildRequires: /usr/bin/pathfix.py
 %ifnarch s390x %{arm}
 BuildRequires: numactl-devel
 %endif
+%ifarch aarch64
+BuildRequires: opencsd-devel >= 1.0.0
+%endif
 BuildRequires: pciutils-devel gettext ncurses-devel
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 BuildRequires: rpm-build, elfutils
@@ -226,8 +229,12 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" tools/ tools/perf/scripts/pyth
 
 cd linux-%{kversion}
 
+%ifarch aarch64
+%global perf_build_extra_opts CORESIGHT=1
+%endif
+
 %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 LIBTRACEEVENT_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 %{?perf_build_extra_opts} prefix=%{_prefix}
 %global perf_python3 -C tools/perf PYTHON=%{__python3}
 # perf
 # make sure check-headers.sh is executable
@@ -488,6 +495,8 @@ popd
 %changelog
 * Mon Feb 21 2022 Justin M. Forbes <jforbes@fedoraproject.org> - 5.17.0-0.rc5.git0.1
 - Linux v5.17-rc5
+- Temporarily stop libtraceevent dynamic until I can figure out why i686 doesn't build.
+- Make coresight aarch64 only.
 
 * Wed Feb 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> - 5.17.0-0.rc4.git0.2
 - Bump for rebuild with libtraceevent update