From c8c3bb5d1f1c40182d97c43e124bfd280fd266f6 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 19 Apr 2020 22:11:50 +0200
Subject: [PATCH] - updated to 5.6.5 - removed obsolete binutils-2.34 patch -
 disable runqslower bpf utility for now (requires kernel image to generate
 vmlinux.h file)

---
 binutils-2.34.patch | 18 ------------------
 kernel-tools.spec   | 23 ++++++++++++++++-------
 2 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 binutils-2.34.patch

diff --git a/binutils-2.34.patch b/binutils-2.34.patch
deleted file mode 100644
index 5d8ecd8..0000000
--- a/binutils-2.34.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- linux-5.5/tools/perf/util/srcline.c~	2020-01-27 01:23:03.000000000 +0100
-+++ linux-5.5/tools/perf/util/srcline.c	2020-03-24 22:05:05.941464830 +0100
-@@ -197,12 +197,12 @@
- 	if (a2l->found)
- 		return;
- 
--	if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
-+	if ((bfd_section_flags(section) & SEC_ALLOC) == 0)
- 		return;
- 
- 	pc = a2l->addr;
--	vma = bfd_get_section_vma(abfd, section);
--	size = bfd_get_section_size(section);
-+	vma = bfd_section_vma(section);
-+	size = bfd_section_size(section);
- 
- 	if (pc < vma || pc >= vma + size)
- 		return;
diff --git a/kernel-tools.spec b/kernel-tools.spec
index e668be6..5434d1b 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -3,7 +3,8 @@
 # - add -n python-perf?
 # - add bcond to disable building docs (perf docs)
 # - install of perf links perf binary again
-
+# - build runqslower (needs vmlinux with BPF section)
+#
 # Conditional build:
 %bcond_without	verbose		# verbose build (V=1)
 %bcond_without	cpupower	# cpupower tools
@@ -11,14 +12,15 @@
 %bcond_without	gtk		# GTK+ 2.x perf support
 %bcond_without	libunwind	# libunwind perf support
 %bcond_without	multilib	# multilib perf support
+%bcond_with	runqslower	# runqslower bpf tool
 %bcond_without	usbip		# usbip utils
 
 %ifnarch %{x8664}
 %undefine	with_multilib
 %endif
 
-%define		basever		5.5
-%define		postver		.11
+%define		basever		5.6
+%define		postver		.5
 Summary:	Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):	Zestaw narzędzi dla jądra Linuksa
 Name:		kernel-tools
@@ -27,18 +29,17 @@ Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5:	0a78b1dc48dc032fe505b170c1b92339
+# Source0-md5:	7b9199ec5fa563ece9ed585ffb17798f
 Source1:	cpupower.service
 Source2:	cpupower.config
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	bbff86f46032a3af00b2755e974df0d3
+# Patch0-md5:	7055ff82e7e6a557c04831a191ed14b3
 %endif
 Patch1:		x32.patch
 Patch2:		regex.patch
 Patch3:		%{name}-perf-update.patch
 Patch4:		%{name}-perf-gtk2.patch
-Patch5:		binutils-2.34.patch
 URL:		https://www.kernel.org/
 BuildRequires:	bison
 BuildRequires:	docutils
@@ -66,6 +67,8 @@ BuildRequires:	elfutils-devel >= 0.158
 BuildRequires:	gcc-multilib-32
 BuildRequires:	gcc-multilib-x32
 %endif
+# for `btftool btf dump file ... format c` - requires vmlinux with BPF section
+%{?with_runqslower:BuildRequires:	kernel-vmlinux >= 5.?}
 %{?with_libunwind:BuildRequires:	libunwind-devel >= 0.99}
 BuildRequires:	numactl-devel
 BuildRequires:	openssl-devel
@@ -401,7 +404,6 @@ cd linux-%{basever}
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %{__sed} -i -e '/^CFLAGS = /s/ -g / $(OPTFLAGS) /' tools/hv/Makefile
 %{__sed} -i -e '/^CFLAGS+=/s/ -O1 / $(OPTFLAGS) /' tools/thermal/tmon/Makefile
@@ -410,6 +412,12 @@ cd linux-%{basever}
 # don't rebuild on make install
 %{__sed} -i -e '/^\$(LIBBPF): FORCE/ s/FORCE$//' tools/bpf/bpftool/Makefile
 
+%if %{without runqslower}
+%{__sed} -i -e '/^all: / s/ runqslower//' \
+	-e '/^install: / s/ runqslower_install//' \
+	tools/bpf/Makefile
+%endif
+
 %build
 Wstringop=""
 Waddressof=""
@@ -462,6 +470,7 @@ CFLAGS="%{rpmcflags}" \
 %{__make} -C tools/bpf \
 	CC="%{__cc}" \
 	EXTRA_CFLAGS="%{rpmcflags}" \
+	%{?with_runqslower:VMLINUX_BTF=$(rpm -ql kernel-vmlinux | head -n 1)} \
 	%{?with_verbose:V=1}
 
 # perf
-- 
2.43.0