[packages/kernel-tools] - up to 6.10.0

baggins baggins at pld-linux.org
Tue Jul 23 18:07:18 CEST 2024


commit 28d753f78f9d96a9bd53b6107594e3a8154d4e28
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jul 23 17:39:00 2024 +0200

    - up to 6.10.0

 kernel-tools-perf-gtk2.patch |  6 +++---
 kernel-tools.spec            | 10 +++++-----
 regex.patch                  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/kernel-tools.spec b/kernel-tools.spec
index 5e99db8..85d2a15 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -19,8 +19,8 @@
 %undefine	with_multilib
 %endif
 
-%define		basever		6.9
-%define		postver		.1
+%define		basever		6.10
+%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
@@ -29,7 +29,7 @@ Release:	3
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
-# Source0-md5:	b9828ed78dae306e3d90643cd5cdb8f1
+# Source0-md5:	c0ce046a9a0d041e13cf222f81eae574
 Source1:	cpupower.service
 Source2:	cpupower.config
 Source3:	cpupower at .service
@@ -628,7 +628,7 @@ 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}
+install -p tools/hv/hv_{fcopy_uio,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
@@ -742,7 +742,7 @@ rm -rf $RPM_BUILD_ROOT
 # 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_fcopy_uio_daemon
 %attr(755,root,root) %{_sbindir}/hv_kvp_daemon
 %attr(755,root,root) %{_sbindir}/hv_vss_daemon
 %endif
diff --git a/kernel-tools-perf-gtk2.patch b/kernel-tools-perf-gtk2.patch
index b31c4c7..2889029 100644
--- a/kernel-tools-perf-gtk2.patch
+++ b/kernel-tools-perf-gtk2.patch
@@ -7,6 +7,6 @@ gtk+2 uses glib APIs that are deprecated in 2.62.x
  
 +FEATURE_CHECK_CFLAGS-gtk2 := -Wno-deprecated-declarations
 +FEATURE_CHECK_CFLAGS-gtk2-infobar := -Wno-deprecated-declarations
- FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi
- # include ARCH specific config
- -include $(src-perf)/arch/$(SRCARCH)/Makefile
+ # for linking with debug library, run like:
+ # make DEBUG=1 LIBTRACEEVENT_DIR=/opt/libtraceevent/
+ TRACEEVENTLIBS := -ltraceevent
diff --git a/regex.patch b/regex.patch
index e058b85..79bf0b6 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:]]+).*"
--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:]]' | \
+-grep -E $regex ${beauty_uapi_linux_dir}/usbdevice_fs.h | grep -E 'USBDEVFS_\w+32[[:space:]]' | \
++grep -E "$regex" ${beauty_uapi_linux_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/28d753f78f9d96a9bd53b6107594e3a8154d4e28



More information about the pld-cvs-commit mailing list