From 386299822031f70bef1a5cad921633ca85ba3f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 13:56:25 -0300
Subject: [PATCH] linux-tools: update to 5.10.4.

---
 .../patches/bfd_section_flags.patch           | 26 -------------------
 srcpkgs/linux-tools/template                  | 23 +++++++---------
 2 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/linux-tools/patches/bfd_section_flags.patch

diff --git a/srcpkgs/linux-tools/patches/bfd_section_flags.patch b/srcpkgs/linux-tools/patches/bfd_section_flags.patch
deleted file mode 100644
index aa10648bb95..00000000000
--- a/srcpkgs/linux-tools/patches/bfd_section_flags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: The binutils macros for bfd section access changed slightly.
-
---- tools/perf/util/srcline.c	2020-05-20 08:20:41.000000000 +0200
-+++ tools/perf/util/srcline.c	2020-05-27 13:48:11.606027082 +0200
-@@ -197,7 +197,7 @@
- 	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;
-@@ -201,8 +201,8 @@
- 		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/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 2d3c4f038e9..e23f9da7ed3 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,20 +1,21 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
-version=5.4.42
-revision=3
+version=5.10.4
+revision=1
 wrksrc="linux-${version}"
 build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3 xmlto"
 makedepends="babeltrace-devel binutils-devel eudev-libudev-devel
  libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
- libzstd-devel ncurses-devel pciutils-devel python3-devel slang-devel"
+ libzstd-devel ncurses-devel pciutils-devel python3-devel slang-devel
+ elfutils-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"
 short_desc="Linux kernel tools meta-pkg"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4e431b7c0266a07b76fdb77f8917ad681f0fa34ffba0eb8a172b67f7ef57bc31
+checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
 python_version=3
 
 subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
@@ -37,15 +38,14 @@ esac
 nocross=yes
 
 post_extract() {
-	sed -i 's/\$(LIBS)/& $(LDFLAGS)/' tools/power/cpupower/bench/Makefile
-	sed -i 's/SIGCLD/SIGCHLD/g' tools/usb/usbip/src/usbipd.c
-	sed -i 's/^CFLAGS/override &/g' tools/thermal/tmon/Makefile
-	sed -i 's/ \-Werror / /g' tools/build/feature/Makefile \
+	vsed -i 's/\$(LIBS)/& $(LDFLAGS)/' tools/power/cpupower/bench/Makefile
+	vsed -i 's/ \-Werror / /g' tools/build/feature/Makefile \
 		tools/lib/bpf/Makefile
 }
 do_build() {
 	cd ${wrksrc}/tools/perf
-	make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+	make ${makejobs} \
+		CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
 		WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \
 		NO_GTK2=1 NO_SDT=1 PYTHON=python3 \
 		PERF_VERSION=${version}_${revision} \
@@ -108,10 +108,7 @@ do_install() {
 	printf 'usbip-core\nusbip-host\n' > \
 		${DESTDIR}/usr/lib/modules-load.d/usbip.conf
 
-	if [ -d ${DESTDIR}/usr/lib64 ]; then
-		mv ${DESTDIR}/usr/lib64/* ${DESTDIR}/usr/lib/
-	fi
-	rm -f ${DESTDIR}/usr/include/cpuidle.h
+	rm ${DESTDIR}/usr/include/cpuidle.h
 }
 
 cpupower_package() {