From 7981c95e7431bedb3b99e13ad79f4a0f517dbfd3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jan 2021 21:12:53 +0100
Subject: [PATCH] linux-tools: add bpftool

Glibc only. :(

Also make sure bash completions end up in the right packages.
---
 srcpkgs/bpftool              |  1 +
 srcpkgs/linux-tools/template | 47 ++++++++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/bpftool

diff --git a/srcpkgs/bpftool b/srcpkgs/bpftool
new file mode 120000
index 0000000000..6594bfcc25
--- /dev/null
+++ b/srcpkgs/bpftool
@@ -0,0 +1 @@
+linux-tools
\ No newline at end of file
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index e23f9da7ed..6ff237d5dd 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,14 +1,15 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
 version=5.10.4
-revision=1
+revision=2
 wrksrc="linux-${version}"
 build_style=meta
-hostmakedepends="asciidoc automake flex gettext libtool perl python3 xmlto"
-makedepends="babeltrace-devel binutils-devel eudev-libudev-devel
+hostmakedepends="asciidoc automake flex gettext libtool perl python3
+ python3-docutils xmlto"
+makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
  libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
- libzstd-devel ncurses-devel pciutils-devel python3-devel slang-devel
- elfutils-devel"
+ libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
+ slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"
 short_desc="Linux kernel tools meta-pkg"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,7 +19,7 @@ distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
 checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
 python_version=3
 
-subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
+subpackages="cpupower freefall libcpupower libcpupower-devel libusbip libusbip-devel perf tmon usbip"
 
 CFLAGS="-Wno-error -fcommon"
 case "$XBPS_TARGET_MACHINE" in
@@ -32,6 +33,10 @@ ppc64*)
 	;;
 esac
 case "$XBPS_TARGET_MACHINE" in
+*-musl) ;;
+*)	subpackages+=" bpftool";;  # needs FTW_ACTIONRETVAL
+esac
+case "$XBPS_TARGET_MACHINE" in
 i686-musl) makedepends+=" libucontext-devel libunwind-devel" ;;
 esac
 
@@ -75,6 +80,14 @@ do_build() {
 
 	cd ${wrksrc}/tools/thermal/tmon
 	make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+
+	case "$XBPS_TARGET_MACHINE" in
+	*-musl) ;;
+	*)
+		cd ${wrksrc}/tools/bpf
+		make -C bpftool all doc
+		make -W runqslower
+	esac
 }
 
 do_install() {
@@ -108,15 +121,35 @@ do_install() {
 	printf 'usbip-core\nusbip-host\n' > \
 		${DESTDIR}/usr/lib/modules-load.d/usbip.conf
 
+	# bpf
+	case "$XBPS_TARGET_MACHINE" in
+	*-musl) ;;
+	*)
+		cd ${wrksrc}/tools/bpf
+		make -W runqslower_install install DESTDIR=${DESTDIR} prefix=/usr
+		make -C bpftool doc-install DESTDIR=${DESTDIR} prefix=/usr/share
+		mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
+	esac
+
 	rm ${DESTDIR}/usr/include/cpuidle.h
 }
 
+bpftool_package() {
+	short_desc="Linux kernel tools for BPF"
+	pkg_install() {
+		vmove "usr/bin/bpf*"
+		vmove usr/share/bash-completion/completions/bpftool
+		vmove "usr/share/man/man7/bpf*"
+		vmove "usr/share/man/man8/bpf*"
+	}
+}
 cpupower_package() {
 	short_desc="Linux kernel tool to set CPU power features"
 	conf_files="/etc/cpufreq-bench.conf"
 	pkg_install() {
 		vmove "usr/bin/cpu*"
 		vmove "usr/share/man/man1/cpu*"
+		vmove usr/share/bash-completion/completions/cpupower
 		vmove usr/share/doc/cpupower
 		vmove usr/share/locale
 		vmove etc/cpufreq-bench.conf
@@ -158,7 +191,7 @@ perf_package() {
 		vmove usr/bin/trace
 		vmove usr/lib/perf
 		vmove usr/libexec/perf-core
-		vmove usr/share/bash-completion
+		vmove usr/share/bash-completion/completions/perf
 		if ! [ "$XBPS_TARGET_MACHINE" = i686 ]; then
 			vmove usr/share/perf-core
 		fi