- updated to 5.11[.0]

- updated slang patch

diff --git a/kernel-tools-slang.patch b/kernel-tools-slang.patch
index c20bf9752e2b4bb8071041eaf671bb8d2c389577..0a80c9f1fea1dbb8af4d865514ca56176eb25355 100644 (file)
--- a/kernel-tools-slang.patch
+++ b/kernel-tools-slang.patch
@@ -1,12 +1,12 @@
 Drop -I/usr/include/slang to allow detection of <slang.h> vs <slang/slang.h>
---- linux-5.10/tools/build/feature/Makefile.orig       2020-12-13 23:41:30.000000000 +0100
-+++ linux-5.10/tools/build/feature/Makefile    2020-12-17 06:28:25.229860807 +0100
+--- linux-5.11/tools/build/feature/Makefile.orig       2021-02-21 21:43:25.374191668 +0100
++++ linux-5.11/tools/build/feature/Makefile    2021-02-21 21:45:11.760281992 +0100
 @@ -90,7 +90,7 @@
  ###############################
  
  $(OUTPUT)test-all.bin:
--      $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -I/usr/include/slang -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd
-+      $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd
+-      $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -I/usr/include/slang -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap
++      $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap
  
  $(OUTPUT)test-hello.bin:
        $(BUILD)

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 2ae8ac1105a0d5feb52cf1f7753946758b55a273..0fbac4fd6f8235fe7639a40435b566f902d06e47 100644 (file)
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -19,17 +19,17 @@
 %undefine      with_multilib
 %endif
 
-%define                basever         5.10
-%define                postver         .1
+%define                basever         5.11
+%define                postver         .0
 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:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: 753adc474bf799d569dec4f165ed92c3
+# Source0-md5: d2985a3f16ef1ea3405c04c406e29dcc
 Source1:       cpupower.service
 Source2:       cpupower.config
 %if "%{postver}" != ".0"
@@ -70,6 +70,7 @@ BuildRequires:        gcc-multilib-x32
 %endif
 # for `btftool btf dump file ... format c` - requires vmlinux with BPF section
 %{?with_runqslower:BuildRequires:      kernel-vmlinux >= 5.?}
+BuildRequires: libcap-devel
 %{?with_libunwind:BuildRequires:       libunwind-devel >= 0.99}
 BuildRequires: numactl-devel
 BuildRequires: openssl-devel
@@ -170,9 +171,7 @@ 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
+%{?noarchpackage}
 
 %description -n bash-completion-cpupower
 Bash completion for cpupower tools.
@@ -296,9 +295,7 @@ Summary(pl.UTF-8):  Bashowe uzupełnianie parametrów dla polecenia perf
 Group:         Applications/Shells
 Requires:      %{name}-perf = %{version}-%{release}
 Requires:      bash-completion
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description -n bash-completion-perf
 Bash completion for perf command.
@@ -312,9 +309,7 @@ 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
+%{?noarchpackage}
 
 %description -n bash-completion-kernel-tools
 Bash completion for kernel-tools commands (currently bpftool).
@@ -590,7 +585,7 @@ install -p tools/power/cpupower/debug/x86_64/{centrino,powernow-k8}-decode $RPM_
 %endif
 
 %if %{with perf}
-%{__make} -C tools/perf install install-man \
+%{__make} -C tools/perf install \
 %ifarch %{x8664}
        IS_X86_64=1 \
        %{!?with_multilib:NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1} \