commit 2f41d1a1035de1c467db193ea3076a1d09b1ae34
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sat Dec 28 11:32:55 2024 +0100
- fix build with 6.6.68, rel 2
lttng-modules.spec | 6 ++++--
sched_stat_runtime.patch | 12 ++++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/lttng-modules.spec b/lttng-modules.spec
index 65370d2..56af42b 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -6,7 +6,7 @@
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%define rel 1
+%define rel 2
%define pname lttng-modules
Summary: LTTng 2.x kernel modules
Summary(pl.UTF-8): Moduły jądra LTTng 2.x
@@ -18,6 +18,7 @@ Group: Base/Kernel
Source0:
https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
# Source0-md5: be5353fb62d7679fff4e393f65002b3f
Patch0: build.patch
+Patch1: sched_stat_runtime.patch
URL: https://lttng.org/
%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.0}
%{?with_kernelsrc:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source
>= 3:3.0}}
@@ -93,7 +94,8 @@ p=`pwd`\
%prep
%setup -qc -n %{name}-%{version}
cd %{pname}-%{version}
-%patch0 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
%build
cd %{pname}-%{version}
diff --git a/sched_stat_runtime.patch b/sched_stat_runtime.patch
new file mode 100644
index 0000000..393a5f6
--- /dev/null
+++ b/sched_stat_runtime.patch
@@ -0,0 +1,12 @@
+--- lttng-modules-2.13.16/include/instrumentation/events/sched.h~
2024-11-18 16:48:45.000000000 +0100
++++ lttng-modules-2.13.16/include/instrumentation/events/sched.h
2024-12-28 11:25:01.593331899 +0100
+@@ -647,7 +647,8 @@
+ TP_ARGS(tsk, delay))
+ #endif
+
+-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0) || \
++#if ((LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) || \
++ (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,6,68)) || \
+ LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0))
+ /*
+ * Tracepoint for accounting runtime (time the task is executing
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/2f41d1a1035de1c467db193ea3076a1d09b1ae34
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
