X-Git-Url: http://git.pld-linux.org/?p=packages%2Fkernel-tools.git;a=blobdiff_plain;f=kernel-tools.spec;h=058c19ac063e6569e5698ce8116863524566d2bc;hp=0f7e63766c4d0f85c1023cabe5bf3709174c86d7;hb=930c3e7;hpb=53bb89cc3961b7aaf681bad8c98a4af68f4bac0a

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 0f7e637..058c19a 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -1,68 +1,94 @@
 # TODO:
 # - redefine: PACKAGE_BUGREPORT=cpufreq@vger.kernel.org
 # - add -n python-perf?
-# - without perf bcond does not work (it still builds it)
 # - add bcond to disable building docs (perf docs)
-# - install of perf compiles things over again
+# - install of perf links perf binary again
 
 # Conditional build:
 %bcond_without	verbose		# verbose build (V=1)
+%bcond_without	cpupower	# cpupower tools
 %bcond_without	perf		# perf tools
 %bcond_without	gtk		# GTK+ 2.x perf support
 %bcond_without	libunwind	# libunwind perf support
+%bcond_without	multilib	# multilib perf support
+%bcond_without	usbip		# usbip utils
 
-%ifarch x32
-%undefine	with_libunwind
+%ifnarch %{x8664}
+%undefine	with_multilib
 %endif
 
-%define		basever		4.0
-%define		postver		.0
+%define		basever		5.3
+%define		postver		.6
 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/v4.x/linux-%{basever}.tar.xz
-# Source0-md5:	a86916bd12798220da9eb4a1eec3616d
+Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
+# Source0-md5:	c99feaade8047339528fb066ec5f8a49
 Source1:	cpupower.service
 Source2:	cpupower.config
 %if "%{postver}" != ".0"
-Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	1fec75551b2f55fced43df8394b1fd9a
+Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
+# Patch0-md5:	2c2db421d422d0d7306fe230c65c862c
 %endif
 Patch1:		x32.patch
-URL:		http://www.kernel.org/
-%ifarch %{x8664}
-BuildRequires:	gcc-multilib-x32
-%endif
+Patch2:		regex.patch
+Patch3:		%{name}-perf-update.patch
+Patch4:		%{name}-perf-gtk2.patch
+URL:		https://www.kernel.org/
+BuildRequires:	bison
+BuildRequires:	docutils
+BuildRequires:	flex
 BuildRequires:	gettext-tools
+BuildRequires:	linux-libc-headers >= 7:4.12
+BuildRequires:	ncurses-devel
+BuildRequires:	ncurses-ext-devel
 BuildRequires:	pciutils-devel
-BuildRequires:	rpmbuild(macros) >= 1.647
+BuildRequires:	pkgconfig
+BuildRequires:	python3
+BuildRequires:	python3-modules
+BuildRequires:	rpmbuild(macros) >= 1.673
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 %if %{with perf}
 BuildRequires:	asciidoc
 BuildRequires:	audit-libs-devel
-BuildRequires:	binutils-devel
-BuildRequires:	bison
+BuildRequires:	babeltrace-devel
+BuildRequires:	binutils-devel >= 4:2.29
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl
-BuildRequires:	elfutils-devel
-BuildRequires:	flex
+BuildRequires:	elfutils-devel >= 0.158
+%if %{with multilib}
+BuildRequires:	gcc-multilib-32
+BuildRequires:	gcc-multilib-x32
+%endif
 %{?with_libunwind:BuildRequires:	libunwind-devel >= 0.99}
 BuildRequires:	numactl-devel
+BuildRequires:	openssl-devel
 BuildRequires:	perl-devel >= 5.1
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	slang-devel
 BuildRequires:	xmlto
+BuildRequires:	xz-devel
+BuildRequires:	zlib-devel
+BuildRequires:	zstd-devel
+# openscd? (CORESIGHT=1 for %{arm}?)
 %if %{with gtk}
 BuildRequires:	gtk+2-devel >= 2.0
-BuildRequires:	pkgconfig
 %endif
 %endif
+%if %{with usbip}
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	gcc >= 6:4.0
+BuildRequires:	libtool >= 2:2
+BuildRequires:	libwrap-devel
+BuildRequires:	udev-devel
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # otherwise /usr/lib/rpm/bin/debugedit: canonicalization unexpectedly shrank by one character
@@ -85,11 +111,7 @@ Group:		Applications/System
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-cpupower-libs = %{version}-%{release}
 Requires:	systemd-units >= 0.38
-Provides:	cpufreq-utils = 1:009-0.6.p1
-Provides:	cpufrequtils = 1:009-0.6.p1
 Provides:	cpupowerutils = 1:009-0.6.p1
-Obsoletes:	cpufreq-utils < 1:009-0.6.p1
-Obsoletes:	cpufrequtils < 1:009-0.6.p1
 Obsoletes:	cpupowerutils < 1:009-0.6.p1
 Obsoletes:	cpuspeed < 1:1.5-16
 
@@ -116,12 +138,10 @@ Biblioteka cpupower.
 Summary:	Development files for the cpupower library
 Summary(pl.UTF-8):	Pliki programistyczne biblioteki cpupower
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-cpupower-libs = %{version}-%{release}
-Provides:	cpufrequtils-devel = 1:009-0.6.p1
 Provides:	cpupowerutils-devel = 1:009-0.6.p1
-Obsoletes:	cpufrequtils-devel < 1:009-0.6.p1
 Obsoletes:	cpupowerutils-devel < 1:009-0.6.p1
+Conflicts:	cpufrequtils-devel
 
 %description cpupower-libs-devel
 Development files for the cpupower library.
@@ -129,6 +149,33 @@ Development files for the cpupower library.
 %description cpupower-libs-devel -l pl.UTF-8
 Pliki programistyczne biblioteki cpupower.
 
+%package -n bash-completion-cpupower
+Summary:	Bash completion for cpupower tools
+Summary(pl.UTF-8):	Bashowe uzupełnianie parametrów dla poleceń cpupower
+Group:		Applications/Shells
+Requires:	%{name}-cpupower = %{version}-%{release}
+Requires:	bash-completion
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description -n bash-completion-cpupower
+Bash completion for cpupower tools.
+
+%description -n bash-completion-cpupower -l pl.UTF-8
+Bashowe uzupełnianie parametrów dla poleceń cpupower.
+
+%package hv
+Summary:	Hyper-V virtualization tools
+Summary(pl.UTF-8):	Narzędzia do wirtualizacji Hyper-V
+Group:		Applications/System
+
+%description hv
+Hyper-V virtualization tools.
+
+%description hv -l pl.UTF-8
+Narzędzia do wirtualizacji Hyper-V.
+
 %package perf
 Summary:	perf profiler tool
 Summary(pl.UTF-8):	Narzędzie profilujące perf
@@ -156,8 +203,8 @@ Ten pakiet zawiera podstawowe pliki, skrypty oraz interfejs tekstowy
 (TUI).
 
 %package perf-vdso32
-Summary:	perf profiler tool
-Summary(pl.UTF-8):	Narzędzie profilujące perf
+Summary:	perf profiler tool - VDSO 32-bit ABI reader
+Summary(pl.UTF-8):	Narzędzie profilujące perf - odczyt VDSO dla ABI 32-bitowego
 Group:		Applications/System
 Requires:	%{name}-perf = %{version}-%{release}
 
@@ -170,9 +217,19 @@ perf_events interface exported by recent versions of the Linux kernel.
 This package contains perf-read-vdso32 tool for reading the 32-bit
 compatibility VDSO in 64-bit mode.
 
+%description perf-vdso32 -l pl.UTF-8
+Perf to narzędzie profilujące dla systemów opartych na Linuksie 2.6+,
+odseparowujące od różnic sprzętowych między pomiarami wydajności w
+zależności od procesora oraz udostępniające prosty interfejs linii
+poleceń. Perf jest oparty na interfejsie perf_events eksportowanym
+przez nowe wersje jądra Linuksa.
+
+Ten pakiet zawiera narzędzie perf-read-vdso32 do odczytu VDSO dla
+binariów 32-bitowych w trybie 64-bitowym.
+
 %package perf-vdsox32
-Summary:	perf profiler tool
-Summary(pl.UTF-8):	Narzędzie profilujące perf
+Summary:	perf profiler tool - VDSO x32 ABI reader
+Summary(pl.UTF-8):	Narzędzie profilujące perf - odczyt VDSO dla ABI x32
 Group:		Applications/System
 Requires:	%{name}-perf = %{version}-%{release}
 
@@ -185,6 +242,16 @@ perf_events interface exported by recent versions of the Linux kernel.
 This package contains perf-read-vdso32 tool for reading the x32 mode
 32-bit compatibility VDSO in 64-bit mode.
 
+%description perf-vdsox32 -l pl.UTF-8
+Perf to narzędzie profilujące dla systemów opartych na Linuksie 2.6+,
+odseparowujące od różnic sprzętowych między pomiarami wydajności w
+zależności od procesora oraz udostępniające prosty interfejs linii
+poleceń. Perf jest oparty na interfejsie perf_events eksportowanym
+przez nowe wersje jądra Linuksa.
+
+Ten pakiet zawiera narzędzie perf-read-vdso32 do odczytu VDSO dla
+binariów ABI x32 w trybie 64-bitowym.
+
 %package perf-gtk
 Summary:	perf profiler tool (GTK+ 2 GUI)
 Summary(pl.UTF-8):	Narzędzie profilujące perf (interfejs graficzny GTK+ 2)
@@ -212,7 +279,7 @@ Ten pakiet zawiera graficzny interfejs oparty na GTK+ 2.
 Summary:	Bash completion for perf command
 Summary(pl.UTF-8):	Bashowe uzupełnianie parametrów dla polecenia perf
 Group:		Applications/Shells
-Requires:	%{name}-perf
+Requires:	%{name}-perf = %{version}-%{release}
 Requires:	bash-completion
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
@@ -224,6 +291,103 @@ Bash completion for perf command.
 %description -n bash-completion-perf -l pl.UTF-8
 Bashowe uzupełnianie parametrów dla polecenia perf.
 
+%package -n bash-completion-kernel-tools
+Summary:	Bash completion for kernel-tools commands
+Summary(pl.UTF-8):	Bashowe uzupełnianie parametrów dla poleceń kernel-tools
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion >= 2.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description -n bash-completion-kernel-tools
+Bash completion for kernel-tools commands (currently bpftool).
+
+%description -n bash-completion-kernel-tools -l pl.UTF-8
+Bashowe uzupełnianie parametrów dla poleceń kernel-tools (obecnie
+bpftool).
+
+%package -n usbip
+Summary:	USB device sharing system over IP network
+Summary(pl.UTF-8):	System współdzielenia urządzeń USB po sieci IP
+Group:		Networking/Utilities
+Requires:	usbip-libs = %{version}-%{release}
+# /lib/hwdata/usb.ids (note: only uncompressed file supported)
+Requires:	hwdata >= 0.243-2
+
+%description -n usbip
+The USB/IP Project aims to develop a general USB device sharing system
+over IP network. To share USB devices between computers with their
+full functionality, USB/IP encapsulates "USB requests" into IP packets
+and transmits them between computers. Original USB device drivers and
+applications can be also used for remote USB devices without any
+modification of them. A computer can use remote USB devices as if they
+were directly attached; for example, we can:
+ - USB storage devices: fdisk, mkfs, mount/umount, file operations,
+   play a DVD movie and record a DVD-R media.
+ - USB keyboards and USB mice: use with Linux console and X Window
+   System.
+ - USB webcams and USB speakers: view webcam, capture image data and
+   play some music.
+ - USB printers, USB scanners, USB serial converters and USB Ethernet
+   interfaces: ok, use fine.
+
+%description -n usbip -l pl.UTF-8
+Projekt USB/IP ma na celu stworzenie ogólnego systemu współdzielenia
+urządzeń USB po sieci IP. W celu współdzielenia urządzeń USB między
+komputerami z zachowaniem pełnej funkcjonalności, USB/IP obudowuje
+żądania SUB w pakiety IP i przesyła je między komputerami. Oryginalne
+sterowniki urządzeń USB oraz aplikacje mogą być używane bez żadnych
+modyfikacji. Komputer może wykorzystywać zdaln urządzenia USB tak,
+jakby były podłączone bezpośrednio. Przykładowe możliwości:
+ - urządzenia USB do przechowywania danych: można używać programów
+   fdisk, mkfs, mount/umount, operacji na plikach, odtwarzać filmy
+   DVD oraz nagrywać nośniki DVD-R
+ - klawiatury i myszy USB: można ich używać na linuksowej konsoli oraz
+   w systemie X Window
+ - kamery i głośniki USB: można oglądać obraz z kamery, robić zdjęcia
+   i odtwarzać muzykę
+ - drukarki, skanery, konwertery portów szeregowych oraz interfejsy
+   sieciowe USB: można ich normalnie używać
+
+%package -n usbip-libs
+Summary:	USB/IP library
+Summary(pl.UTF-8):	Biblioteka USB/IP
+Group:		Libraries
+
+%description -n usbip-libs
+USB over IP library.
+
+%description -n usbip-libs -l pl.UTF-8
+Biblioteka USB po IP.
+
+%package -n usbip-devel
+Summary:	Header files for usbip library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki usbip
+Group:		Development/Libraries
+Requires:	usbip-libs = %{version}-%{release}
+
+%description -n usbip-devel
+This package contains the header files needed to develop programs
+which make use of USB/IP.
+
+%description -n usbip-devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia programów
+wykorzystujących USB/IP.
+
+%package -n usbip-static
+Summary:	Static usbip library
+Summary(pl.UTF-8):	Statyczna biblioteka usbip
+Group:		Development/Libraries
+Requires:	usbip-devel = %{version}-%{release}
+
+%description -n usbip-static
+Static usbip library.
+
+%description -n usbip-static -l pl.UTF-8
+Statyczna biblioteka usbip.
+
 %prep
 %setup -qc
 cd linux-%{basever}
@@ -233,16 +397,91 @@ cd linux-%{basever}
 %endif
 
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+%{__sed} -i -e '/^CFLAGS = /s/ -g / $(OPTFLAGS) /' tools/hv/Makefile
+%{__sed} -i -e '/^CFLAGS+=/s/ -O1 / $(OPTFLAGS) /' tools/thermal/tmon/Makefile
+%{__sed} -i -e 's#libexec/perf-core#share/perf-core#g' tools/perf/Makefile.config
 
-sed -i -e 's#libexec/perf-core#%{_datadir}/perf-core#g' tools/perf/config/Makefile
+# don't rebuild on make install
+%{__sed} -i -e '/^\$(LIBBPF): FORCE/ s/FORCE$//' tools/bpf/bpftool/Makefile
 
 %build
+Wstringop=""
+Waddressof=""
+%if "%{cc_version}" >= "8"
+Wstringop="-Wno-error=stringop-truncation"
+%endif
+%if "%{cc_version}" >= "9"
+Waddressof="-Wno-error=address-of-packed-member"
+%endif
 cd linux-%{basever}
 
 # Simple Disk Sleep Monitor
-%{__cc} %{rpmcppflags} %{rpmcflags} %{rpmldflags} Documentation/laptops/dslm.c -o dslm
+%{__make} -C tools/laptop/dslm \
+	%{makeopts} \
+	EXTRA_CFLAGS="%{rpmcflags}"
+
+# tools common (used eg. by tools/vm)
+%{__make} -C tools/lib/api \
+	%{makeopts} \
+	EXTRA_CFLAGS="%{rpmcflags} $Wstringop"
+
+# lsgpio
+CFLAGS="%{rpmcflags}" \
+%{__make} -C tools/gpio -j1 \
+	%{makeopts}
+
+# HyperV is Windows based, x86 specific
+%ifarch %{ix86} %{x8664} x32
+%{__make} -C tools/hv \
+	CC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags}"
+%endif
+
+CFLAGS="%{rpmcflags}" \
+%{__make} -C tools/iio -j1 \
+	CC="%{__cc}" \
+	%{?with_verbose:V=1}
+
+%{__make} -C tools/laptop/freefall \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}"
+
+# make bpftool first, top-level bpf CFLAGS cause includes conflict
+CFLAGS="%{rpmcflags}" \
+%{__make} -C tools/bpf/bpftool \
+	CC="%{__cc}" \
+	%{?with_verbose:V=1}
+
+CFLAGS="%{rpmcflags}" \
+%{__make} -C tools/bpf \
+	CC="%{__cc}" \
+	EXTRA_CFLAGS="%{rpmcflags}" \
+	%{?with_verbose:V=1}
+
+# perf
+%if %{with perf}
+%{__make} -j1 -C tools/perf all man \
+%ifarch %{x8664}
+	IS_X86_64=1 \
+	%{!?with_multilib:NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1} \
+%endif
+	%{!?with_gtk:NO_GTK2=1} \
+	%{!?with_libunwind:NO_LIBUNWIND=1} \
+	%{makeopts} \
+	CFLAGS_OPTIMIZE="%{rpmcflags}" \
+	WERROR=0 \
+	prefix=%{_prefix} \
+	perfexecdir=%{_datadir}/perf-core \
+	lib=%{_lib} \
+	template_dir=%{_datadir}/perf-core/templates
+%endif
 
 # cpupower
+%if %{with cpupower}
 %{__make} -C tools/power/cpupower \
 	%{makeopts} \
 	CPUFREQ_BENCH=false \
@@ -260,37 +499,43 @@ cd linux-%{basever}
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}"
 %endif
+%endif
 
 %ifarch %{ix86} %{x8664} x32
+CFLAGS="%{rpmcflags}" \
 %{__make} -C tools/power/x86/x86_energy_perf_policy \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+	CC="%{__cc}"
+
 CFLAGS="%{rpmcflags}" \
 %{__make} -C tools/power/x86/turbostat \
 	CC="%{__cc}"
 %endif
 
+%{__make} -C tools/thermal/tmon \
+	CC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags}"
+
+# usbip-utils
+%if %{with usbip}
+cd tools/usb/usbip
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	CFLAGS="%{rpmcflags} $Wstringop $Waddressof" \
+	--disable-silent-rules \
+	--with-usbids-dir=/lib/hwdata
+%{__make}
+cd ../../..
+%endif
+
 # page-types, slabinfo
 %{__make} -C tools/vm page-types slabinfo \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -Wall -Wextra -I../lib"
 
-%if %{with perf}
-%{__make} -C tools/perf all man \
-%ifarch %{x8664}
-	IS_X86_64=1 \
-%endif
-	%{!?with_gtk:NO_GTK2=1} \
-	%{!?with_libunwind:NO_LIBUNWIND=1} \
-	%{makeopts} \
-	CFLAGS_OPTIMIZE="%{rpmcflags}" \
-	WERROR=0 \
-	prefix=%{_prefix} \
-	perfexecdir=%{_datadir}/perf-core \
-	lib=%{_lib} \
-	template_dir=%{_datadir}/perf-core/templates
-%endif
-
 # gen_init_cpio
 %{__make} -C usr gen_init_cpio \
 	%{makeopts} \
@@ -300,8 +545,8 @@ CFLAGS="%{rpmcflags}" \
 rm -rf $RPM_BUILD_ROOT
 
 cd linux-%{basever}
-install -d $RPM_BUILD_ROOT%{_sbindir}
 
+%if %{with cpupower}
 %{__make} -C tools/power/cpupower install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	libdir=%{_libdir} \
@@ -309,7 +554,7 @@ install -d $RPM_BUILD_ROOT%{_sbindir}
 	CPUFREQ_BENCH=false
 
 %find_lang cpupower
-mv cpupower.lang ..
+%{__mv} cpupower.lang ..
 
 install -d $RPM_BUILD_ROOT{/etc/sysconfig,%{systemdunitdir}}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/cpupower.service
@@ -321,43 +566,13 @@ install -p tools/power/cpupower/debug/i386/{centrino,powernow-k8}-decode $RPM_BU
 %ifarch %{x8664} x32
 install -p tools/power/cpupower/debug/x86_64/{centrino,powernow-k8}-decode $RPM_BUILD_ROOT%{_bindir}
 %endif
-
-install -p tools/vm/slabinfo $RPM_BUILD_ROOT%{_bindir}
-install -p tools/vm/page-types $RPM_BUILD_ROOT%{_sbindir}
-install -p dslm $RPM_BUILD_ROOT%{_sbindir}
-
-%ifarch %{ix86} %{x8664} x32
-install -d $RPM_BUILD_ROOT%{_mandir}/man8
-# broken makefile, install manually
-%if 0
-%{__make} install \
-	-C tools/power/x86/x86_energy_perf_policy \
-	DESTDIR=$RPM_BUILD_ROOT
-%else
-cd tools/power/x86/x86_energy_perf_policy
-install -p x86_energy_perf_policy $RPM_BUILD_ROOT%{_bindir}
-cp -p x86_energy_perf_policy.8 $RPM_BUILD_ROOT%{_mandir}/man8
-cd -
-%endif
-
-# broken makefile, install manually
-%if 0
-%{__make} install \
-	-C tools/power/x86/turbostat \
-	DESTDIR=$RPM_BUILD_ROOT
-%else
-cd tools/power/x86/turbostat
-cp -p turbostat.8 $RPM_BUILD_ROOT%{_mandir}/man8
-cd -
-install -p turbostat $RPM_BUILD_ROOT%{_bindir}/turbostat
-%endif
 %endif
 
 %if %{with perf}
-%{__make} -j1 install install-man \
-	-C tools/perf \
+%{__make} -C tools/perf install install-man \
 %ifarch %{x8664}
 	IS_X86_64=1 \
+	%{!?with_multilib:NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1} \
 %endif
 	%{!?with_gtk:NO_GTK2=1} \
 	%{!?with_libunwind:NO_LIBUNWIND=1} \
@@ -368,6 +583,7 @@ install -p turbostat $RPM_BUILD_ROOT%{_bindir}/turbostat
 	prefix=%{_prefix} \
 	perfexecdir=%{_datadir}/perf-core \
 	template_dir=%{_datadir}/perf-core/templates \
+	bash_compdir=%{bash_compdir} \
 	lib=%{_lib} \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -377,9 +593,60 @@ install -p turbostat $RPM_BUILD_ROOT%{_bindir}/turbostat
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/perf-core/tests
 %endif
 
+%if %{with usbip}
+%{__make} -C tools/usb/usbip install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libusbip.la
+%endif
+
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man8}
+
+install -p tools/laptop/dslm/dslm $RPM_BUILD_ROOT%{_sbindir}
+
+install -p tools/gpio/lsgpio $RPM_BUILD_ROOT%{_bindir}
+
+%ifarch %{ix86} %{x8664} x32
+install -p tools/hv/hv_{fcopy,kvp,vss}_daemon $RPM_BUILD_ROOT%{_sbindir}
+# TODO: PLD-specific hv_get_dhcp_info,hv_get_dns_info,hv_set_ifconfig
+%{__sed} -e '1s,/usr/bin/env python,%{__python},' tools/hv/lsvmbus >$RPM_BUILD_ROOT%{_bindir}/lsvmbus
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/lsvmbus
+%endif
+
+install -p tools/iio/{iio_event_monitor,iio_generic_buffer,lsiio} $RPM_BUILD_ROOT%{_bindir}
+
+install -p tools/laptop/freefall/freefall $RPM_BUILD_ROOT%{_sbindir}
+
+%{__make} -C tools/bpf install \
+	prefix=$RPM_BUILD_ROOT%{_prefix} \
+	bash_compdir=$RPM_BUILD_ROOT%{bash_compdir} \
+	%{?with_verbose:V=1}
+%{__make} -C tools/bpf/bpftool doc-install \
+	prefix=$RPM_BUILD_ROOT%{_prefix} \
+	mandir=$RPM_BUILD_ROOT%{_mandir} \
+	%{?with_verbose:V=1}
+
+install -p tools/thermal/tmon/tmon $RPM_BUILD_ROOT%{_bindir}
+cp -p tools/thermal/tmon/tmon.8 $RPM_BUILD_ROOT%{_mandir}/man8
+
+install -p tools/vm/slabinfo $RPM_BUILD_ROOT%{_bindir}
+install -p tools/vm/page-types $RPM_BUILD_ROOT%{_sbindir}
+
+%ifarch %{ix86} %{x8664} x32
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+%{__make} -C tools/power/x86/x86_energy_perf_policy install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%{__make} -C tools/power/x86/turbostat install \
+	DESTDIR=$RPM_BUILD_ROOT
+%endif
+
 # gen_init_cpio
 install -p usr/gen_init_cpio $RPM_BUILD_ROOT%{_bindir}/gen_init_cpio
 
+# packaged in man-pages (5.02)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/bpf-helpers.7*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -395,12 +662,27 @@ rm -rf $RPM_BUILD_ROOT
 %postun cpupower
 %systemd_reload
 
+%post	-n usbip-libs -p /sbin/ldconfig
+%postun	-n usbip-libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/bpf_asm
+%attr(755,root,root) %{_bindir}/bpf_dbg
+%attr(755,root,root) %{_bindir}/bpf_jit_disasm
 %attr(755,root,root) %{_bindir}/gen_init_cpio
+%attr(755,root,root) %{_bindir}/iio_event_monitor
+%attr(755,root,root) %{_bindir}/iio_generic_buffer
+%attr(755,root,root) %{_bindir}/lsgpio
+%attr(755,root,root) %{_bindir}/lsiio
 %attr(755,root,root) %{_bindir}/slabinfo
+%attr(755,root,root) %{_bindir}/tmon
+%attr(755,root,root) %{_sbindir}/bpftool
 %attr(755,root,root) %{_sbindir}/dslm
+%attr(755,root,root) %{_sbindir}/freefall
 %attr(755,root,root) %{_sbindir}/page-types
+%{_mandir}/man8/bpftool*.8*
+%{_mandir}/man8/tmon.8*
 %ifarch %{ix86} %{x8664} x32
 %attr(755,root,root) %{_bindir}/centrino-decode
 %attr(755,root,root) %{_bindir}/powernow-k8-decode
@@ -428,6 +710,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcpupower.so
 %{_includedir}/cpufreq.h
+%{_includedir}/cpuidle.h
+
+%files -n bash-completion-cpupower
+%defattr(644,root,root,755)
+%{bash_compdir}/cpupower
+
+%ifarch %{ix86} %{x8664} x32
+%files hv
+%defattr(644,root,root,755)
+# TODO: PLDify these scripts and move to bindir
+%doc linux-%{basever}/tools/hv/hv_{get_dhcp_info,get_dns_info,set_ifconfig}.sh
+%attr(755,root,root) %{_bindir}/lsvmbus
+%attr(755,root,root) %{_sbindir}/hv_fcopy_daemon
+%attr(755,root,root) %{_sbindir}/hv_kvp_daemon
+%attr(755,root,root) %{_sbindir}/hv_vss_daemon
+%endif
 
 %if %{with perf}
 %files perf
@@ -435,9 +733,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/perf
 %attr(755,root,root) %{_bindir}/trace
 %{_mandir}/man1/perf*.1*
+%{_docdir}/perf-tip
 %dir %{_datadir}/perf-core
 %attr(755,root,root) %{_datadir}/perf-core/perf-archive
 %attr(755,root,root) %{_datadir}/perf-core/perf-with-kcore
+%{_datadir}/perf-core/strace
 
 %dir %{_datadir}/perf-core/scripts
 
@@ -465,7 +765,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/traceevent/plugins
 %attr(755,root,root) %{_libdir}/traceevent/plugins/plugin_*.so
 
-%ifarch %{x8664}
+%dir %{_prefix}/lib/perf
+%{_prefix}/lib/perf/examples
+%{_prefix}/lib/perf/include
+
+%if %{with multilib}
 %files perf-vdso32
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/perf-read-vdso32
@@ -485,3 +789,31 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 /etc/bash_completion.d/perf
 %endif
+
+%files -n bash-completion-kernel-tools
+%defattr(644,root,root,755)
+%{bash_compdir}/bpftool
+
+%if %{with usbip}
+%files -n usbip
+%defattr(644,root,root,755)
+%doc linux-%{basever}/tools/usb/usbip/{AUTHORS,README}
+%attr(755,root,root) %{_sbindir}/usbip
+%attr(755,root,root) %{_sbindir}/usbipd
+%{_mandir}/man8/usbip.8*
+%{_mandir}/man8/usbipd.8*
+
+%files -n usbip-libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libusbip.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libusbip.so.0
+
+%files -n usbip-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libusbip.so
+%{_includedir}/usbip
+
+%files -n usbip-static
+%defattr(644,root,root,755)
+%{_libdir}/libusbip.a
+%endif