commit ab38cecff88a2a0ab3f42d6dfeedfb4f3efc87fb
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sat Feb 25 15:21:09 2023 +0100
- up to 6.2.1, tracevent needs external library to build now
kernel-tools-perf-update.patch | 6 +++---
kernel-tools.spec | 14 ++++++++------
regex.patch | 4 ++--
3 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/kernel-tools.spec b/kernel-tools.spec
index 49512b9..7931d84 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -19,23 +19,23 @@
%undefine with_multilib
%endif
-%define basever 6.1
-%define postver .6
+%define basever 6.2
+%define postver .1
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: 0.1
License: GPL v2
Group: Applications/System
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
-# Source0-md5: 475320de08f16c9fa486fc4edfe98b30
+# Source0-md5: 787862593d7bf354cf1a5c37e21fc147
Source1: cpupower.service
Source2: cpupower.config
Source3: cpupower@.service
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: 3c4ce326d5e8afd9e7e13d55f7cec8bc
+# Patch0-md5: be09fdc4f007b676d67e894d96304500
%endif
Patch1: x32.patch
Patch2: regex.patch
@@ -46,6 +46,7 @@ BuildRequires: bison
BuildRequires: docutils
BuildRequires: flex
BuildRequires: gettext-tools
+BuildRequires: libtraceevent-devel
BuildRequires: linux-libc-headers >= 7:4.12
BuildRequires: ncurses-devel
BuildRequires: ncurses-ext-devel
@@ -728,6 +729,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libcpupower.so
%{_includedir}/cpufreq.h
%{_includedir}/cpuidle.h
+%{_includedir}/powercap.h
%files -n bash-completion-cpupower
%defattr(644,root,root,755)
@@ -792,7 +794,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_prefix}/lib/perf
%{_prefix}/lib/perf/examples
-%{_prefix}/lib/perf/include
+#%{_prefix}/lib/perf/include
%{_includedir}/perf
diff --git a/kernel-tools-perf-update.patch b/kernel-tools-perf-update.patch
index 613cbaf..04b26a1 100644
--- a/kernel-tools-perf-update.patch
+++ b/kernel-tools-perf-update.patch
@@ -11,8 +11,8 @@
--- 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__)
@@ -21,7 +21,7 @@
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,
+ &suite__intel_pt,
#endif
-#if defined(__x86_64__)
+#if defined(__x86_64__) && !defined(__ILP32__)
diff --git a/regex.patch b/regex.patch
index 5ffa88c..e058b85 100644
--- a/regex.patch
+++ b/regex.patch
@@ -4,8 +4,8 @@
printf "#if 0\n"
printf "static const char *usbdevfs_ioctl_32_cmds[] = {\n"
regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)[[:space:]]+_IO[WR]{0,2}\([[:space:]]*'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*"
--egrep $regex ${header_dir}/usbdevice_fs.h | egrep 'USBDEVFS_\w+32[[:space:]]'
| \
-+egrep "$regex" ${header_dir}/usbdevice_fs.h | egrep
'USBDEVFS_\w+32[[:space:]]' | \
+-grep -E $regex ${header_dir}/usbdevice_fs.h | grep -E
'USBDEVFS_\w+32[[:space:]]' | \
++grep -E "$regex" ${header_dir}/usbdevice_fs.h | grep -E
'USBDEVFS_\w+32[[:space:]]' | \
sed -r "s/$regex/\2 \1/g" | \
sort | xargs printf "\t[%s] = \"%s\",\n"
printf "};\n"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel-tools.git/commitdiff/ab38cecff88a2a0ab3f42d6dfeedfb4f3efc87fb
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
