commit 319723eb5ae619852beecfec5d70007248d91d92
Author: Jakub Bogusz <[email protected]>
Date: Sat Jan 15 21:47:54 2022 +0100
- updated to 5.16[.0]
- removed obsolete slang patch
kernel-tools-perf-update.patch | 25 ++++++++++-----
kernel-tools-slang.patch | 12 -------
kernel-tools.spec | 72 ++++++++++++++++++++++--------------------
3 files changed, 54 insertions(+), 55 deletions(-)
---
diff --git a/kernel-tools.spec b/kernel-tools.spec
index fc730f1..cad8e30 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -19,7 +19,7 @@
%undefine with_multilib
%endif
-%define basever 5.15
+%define basever 5.16
%define postver .0
Summary: Assortment of tools for the Linux kernel
Summary(pl.UTF-8): Zestaw narzędzi dla jądra Linuksa
@@ -29,7 +29,7 @@ Release: 1
License: GPL v2
Group: Applications/System
Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: 071d49ff4e020d58c04f9f3f76d3b594
+# Source0-md5: e6680ce7c989a3efe58b51e3f3f0bf93
Source1: cpupower.service
Source2: cpupower.config
%if "%{postver}" != ".0"
@@ -40,7 +40,6 @@ Patch1: x32.patch
Patch2: regex.patch
Patch3: %{name}-perf-update.patch
Patch4: %{name}-perf-gtk2.patch
-Patch5: %{name}-slang.patch
URL: https://www.kernel.org/
BuildRequires: bison
BuildRequires: docutils
@@ -410,11 +409,10 @@ cd linux-%{basever}
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -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#%{_lib}/perf-core#g'
tools/perf/Makefile.config
# don't rebuild on make install
%{__sed} -i -e '/^\$(LIBBPF): FORCE/ s/FORCE$//' tools/bpf/bpftool/Makefile
@@ -491,7 +489,7 @@ CFLAGS="%{rpmcflags}" \
VF=1 \
WERROR=0 \
prefix=%{_prefix} \
- perfexecdir=%{_datadir}/perf-core \
+ perfexecdir=%{_libdir}/perf-core \
lib=%{_lib} \
template_dir=%{_datadir}/perf-core/templates
%endif
@@ -596,16 +594,16 @@ install -p
tools/power/cpupower/debug/x86_64/{centrino,powernow-k8}-decode $RPM_
EXTRA_CFLAGS="%{rpmcflags}" \
WERROR=0 \
prefix=%{_prefix} \
- perfexecdir=%{_datadir}/perf-core \
+ perfexecdir=%{_libdir}/perf-core \
template_dir=%{_datadir}/perf-core/templates \
bash_compdir=%{bash_compdir} \
lib=%{_lib} \
DESTDIR=$RPM_BUILD_ROOT
-%py_comp $RPM_BUILD_ROOT%{_datadir}/perf-core/scripts/python
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/perf-core/scripts/python
+%py_comp $RPM_BUILD_ROOT%{_libdir}/perf-core/scripts/python
+%py_ocomp $RPM_BUILD_ROOT%{_libdir}/perf-core/scripts/python
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/perf-core/tests
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/perf-core/tests
%endif
%if %{with usbip}
@@ -747,32 +745,36 @@ rm -rf $RPM_BUILD_ROOT
%{_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-iostat
-%attr(755,root,root) %{_datadir}/perf-core/perf-with-kcore
%{_datadir}/perf-core/strace
-
-%dir %{_datadir}/perf-core/scripts
-
-%dir %{_datadir}/perf-core/scripts/perl
-%dir %{_datadir}/perf-core/scripts/perl/Perf-Trace-Util
-%dir %{_datadir}/perf-core/scripts/perl/Perf-Trace-Util/lib
-%dir %{_datadir}/perf-core/scripts/perl/Perf-Trace-Util/lib/Perf
-%dir %{_datadir}/perf-core/scripts/perl/Perf-Trace-Util/lib/Perf/Trace
-%{_datadir}/perf-core/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/*.pm
-%dir %{_datadir}/perf-core/scripts/perl/bin
-%attr(755,root,root) %{_datadir}/perf-core/scripts/perl/bin/*
-%{_datadir}/perf-core/scripts/perl/*.pl
-
-%dir %{_datadir}/perf-core/scripts/python
-%dir %{_datadir}/perf-core/scripts/python/Perf-Trace-Util
-%dir %{_datadir}/perf-core/scripts/python/Perf-Trace-Util/lib
-%dir %{_datadir}/perf-core/scripts/python/Perf-Trace-Util/lib/Perf
-%dir %{_datadir}/perf-core/scripts/python/Perf-Trace-Util/lib/Perf/Trace
-%{_datadir}/perf-core/scripts/python/Perf-Trace-Util/lib/Perf/Trace/*.py*
-%dir %{_datadir}/perf-core/scripts/python/bin
-%attr(755,root,root) %{_datadir}/perf-core/scripts/python/bin/*
-%{_datadir}/perf-core/scripts/python/*.py*
+%dir %{_libdir}/perf-core
+%attr(755,root,root) %{_libdir}/perf-core/perf-archive
+%attr(755,root,root) %{_libdir}/perf-core/perf-iostat
+%attr(755,root,root) %{_libdir}/perf-core/perf-with-kcore
+%dir %{_libdir}/perf-core/dlfilters
+%attr(755,root,root) %{_libdir}/perf-core/dlfilters/dlfilter-show-cycles.so
+%attr(755,root,root) %{_libdir}/perf-core/dlfilters/dlfilter-test-api-v0.so
+
+%dir %{_libdir}/perf-core/scripts
+
+%dir %{_libdir}/perf-core/scripts/perl
+%dir %{_libdir}/perf-core/scripts/perl/Perf-Trace-Util
+%dir %{_libdir}/perf-core/scripts/perl/Perf-Trace-Util/lib
+%dir %{_libdir}/perf-core/scripts/perl/Perf-Trace-Util/lib/Perf
+%dir %{_libdir}/perf-core/scripts/perl/Perf-Trace-Util/lib/Perf/Trace
+%{_libdir}/perf-core/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/*.pm
+%dir %{_libdir}/perf-core/scripts/perl/bin
+%attr(755,root,root) %{_libdir}/perf-core/scripts/perl/bin/*
+%{_libdir}/perf-core/scripts/perl/*.pl
+
+%dir %{_libdir}/perf-core/scripts/python
+%dir %{_libdir}/perf-core/scripts/python/Perf-Trace-Util
+%dir %{_libdir}/perf-core/scripts/python/Perf-Trace-Util/lib
+%dir %{_libdir}/perf-core/scripts/python/Perf-Trace-Util/lib/Perf
+%dir %{_libdir}/perf-core/scripts/python/Perf-Trace-Util/lib/Perf/Trace
+%{_libdir}/perf-core/scripts/python/Perf-Trace-Util/lib/Perf/Trace/*.py*
+%dir %{_libdir}/perf-core/scripts/python/bin
+%attr(755,root,root) %{_libdir}/perf-core/scripts/python/bin/*
+%{_libdir}/perf-core/scripts/python/*.py*
%dir %{_libdir}/traceevent
%dir %{_libdir}/traceevent/plugins
diff --git a/kernel-tools-perf-update.patch b/kernel-tools-perf-update.patch
index edf3711..613cbaf 100644
--- a/kernel-tools-perf-update.patch
+++ b/kernel-tools-perf-update.patch
@@ -8,14 +8,23 @@
/* HAVE_ARCH_X86_64_SUPPORT is used in'arch/x86/util/unwind-libunwind.c'
* for x86_32, we undef it to compile code for x86_32 only.
*/
---- linux-5.11/tools/perf/arch/x86/tests/arch-tests.c.orig 2021-02-25
21:48:00.008225040 +0100
-+++ linux-5.11/tools/perf/arch/x86/tests/arch-tests.c 2021-02-25
22:02:49.697363536 +0100
-@@ -24,7 +24,7 @@
- .func = test__intel_pt_pkt_decoder,
- },
+--- linux-5.16/tools/perf/arch/x86/tests/arch-tests.c.orig 2022-01-15
10:37:17.937990467 +0100
++++ linux-5.16/tools/perf/arch/x86/tests/arch-tests.c 2022-01-15
11:34:56.522587040 +0100
+@@ -8,7 +8,7 @@ DEFINE_SUITE("x86 rdpmc", rdpmc);
+ DEFINE_SUITE("x86 instruction decoder - new instructions", insn_x86);
+ DEFINE_SUITE("Intel PT packet decoder", intel_pt_pkt_decoder);
#endif
-#if defined(__x86_64__)
+#if defined(__x86_64__) && !defined(__ILP32__)
- {
- .desc = "x86 bp modify",
- .func = test__bp_modify,
+ DEFINE_SUITE("x86 bp modify", bp_modify);
+ #endif
+ DEFINE_SUITE("x86 Sample parsing", x86_sample_parsing);
+@@ -22,7 +22,7 @@ struct test_suite *arch_tests[] = {
+ &suite__insn_x86,
+ &suite__intel_pt_pkt_decoder,
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && !defined(__ILP32__)
+ &suite__bp_modify,
+ #endif
+ &suite__x86_sample_parsing,
diff --git a/kernel-tools-slang.patch b/kernel-tools-slang.patch
deleted file mode 100644
index 0a80c9f..0000000
--- a/kernel-tools-slang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Drop -I/usr/include/slang to allow detection of <slang.h> vs <slang/slang.h>
---- 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 -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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel-tools.git/commitdiff/319723eb5ae619852beecfec5d70007248d91d92
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
