From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 27 Jul 2020 15:14:55 +0000 (+0200)
Subject: - added binutils2.35 patch (adjust Makefile for nm output change); release 3
X-Git-Tag: auto/th/kernel-tools-5.7.0-3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fkernel-tools.git;a=commitdiff_plain;h=c66e687

- added binutils2.35 patch (adjust Makefile for nm output change); release 3
---

diff --git a/kernel-tools-binutils2.35.patch b/kernel-tools-binutils2.35.patch
new file mode 100644
index 0000000..a225bf3
--- /dev/null
+++ b/kernel-tools-binutils2.35.patch
@@ -0,0 +1,11 @@
+--- linux-5.7/tools/lib/traceevent/plugins/Makefile.orig	2020-06-01 01:49:15.000000000 +0200
++++ linux-5.7/tools/lib/traceevent/plugins/Makefile	2020-07-27 17:00:03.592989940 +0200
+@@ -197,7 +197,7 @@
+ 	xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\
+ 	if [ "$$symbol_type" = "U W" ];then				\
+ 		(echo '{';                                              \
+-		$(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\
++		$(NM) -u -D $1 | awk 'NF>1 {gsub("@.*", "", $$2); print "\t"$$2";"}' | sort -u;\
+ 		echo '};';                                              \
+ 		) > $2;                                                 \
+ 	else                                                            \
diff --git a/kernel-tools.spec b/kernel-tools.spec
index 88dea12..7a9a041 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -25,7 +25,7 @@ Summary:	Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):	Zestaw narzędzi dla jądra Linuksa
 Name:		kernel-tools
 Version:	%{basever}%{postver}
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
@@ -43,6 +43,7 @@ Patch4:		%{name}-perf-gtk2.patch
 Patch5:		%{name}-bpf-hashmap-upstream.patch
 Patch6:		%{name}-bpf-hashmap.patch
 Patch7:		%{name}-usbip-nocommon.patch
+Patch8:		%{name}-binutils2.35.patch
 URL:		https://www.kernel.org/
 BuildRequires:	bison
 BuildRequires:	docutils
@@ -410,6 +411,7 @@ cd linux-%{basever}
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %{__sed} -i -e '/^CFLAGS = /s/ -g / $(OPTFLAGS) /' tools/hv/Makefile
 %{__sed} -i -e '/^CFLAGS+=/s/ -O1 / $(OPTFLAGS) /' tools/thermal/tmon/Makefile