From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 14 Apr 2020 16:13:40 +0000 (+0200)
Subject: - updated to 2.12.0 (for Linux 3.0+; ftrace integration dropped)
X-Git-Tag: auto/th/lttng-modules-2.12.0-1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Flttng-modules.git;a=commitdiff_plain;h=9a3ded0

- updated to 2.12.0 (for Linux 3.0+; ftrace integration dropped)
- removed obsolete kernel-5.5.3 patch
---

diff --git a/kernel-5.5.3.patch b/kernel-5.5.3.patch
deleted file mode 100644
index 586b648..0000000
--- a/kernel-5.5.3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- lttng-modules-2.11.1/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h~	2020-01-28 16:09:46.000000000 +0100
-+++ lttng-modules-2.11.1/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h	2020-02-23 07:58:12.916686709 +0100
-@@ -219,6 +219,21 @@
- 
- 	kvm_mmu_fast_page_fault,
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
-+	TP_PROTO(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u32 error_code,
-+		 u64 *sptep, u64 old_spte, bool retry),
-+	TP_ARGS(vcpu, cr2_or_gpa, error_code, sptep, old_spte, retry),
-+
-+	TP_FIELDS(
-+		ctf_integer(int, vcpu_id, vcpu->vcpu_id)
-+		ctf_integer(gpa_t, cr2_or_gpa, cr2_or_gpa)
-+		ctf_integer(u32, error_code, error_code)
-+		ctf_integer_hex(u64 *, sptep, sptep)
-+		ctf_integer(u64, old_spte, old_spte)
-+		ctf_integer(u64, new_spte, *sptep)
-+		ctf_integer(bool, retry, retry)
-+	)
-+#else
- 	TP_PROTO(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code,
- 		 u64 *sptep, u64 old_spte, bool retry),
- 	TP_ARGS(vcpu, gva, error_code, sptep, old_spte, retry),
-@@ -232,6 +247,7 @@
- 		ctf_integer(u64, new_spte, *sptep)
- 		ctf_integer(bool, retry, retry)
- 	)
-+#endif
- )
- #endif /* LTTNG_TRACE_KVM_MMU_H */
- 
diff --git a/lttng-modules.spec b/lttng-modules.spec
index 76d728f..3cb49ac 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,7 +1,6 @@
 #
 # Conditional build:
 %bcond_without	kernelsrc	# probes which require full kernel source (kvm, btrfs, ext4, regmap)
-%bcond_without	ftrace		# dynamic ftrace module
 %bcond_with	verbose		# verbose build (V=1)
 
 # nothing to be placed to debuginfo package
@@ -12,18 +11,17 @@
 Summary:	LTTng 2.x kernel modules
 Summary(pl.UTF-8):	Moduły jądra LTTng 2.x
 Name:		%{pname}%{_alt_kernel}
-Version:	2.11.2
+Version:	2.12.0
 Release:	%{rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5:	2e3bc8cfb264fa13f374618b46f170e7
+# Source0-md5:	be252df5013ea03894921d0b493c7b6c
 Patch0:		build.patch
-Patch1:		kernel-5.5.3.patch
 URL:		https://lttng.org/
-%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.38}
-%{?with_kernelsrc:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source >= 3:2.6.38}}
-BuildRequires:	rpmbuild(macros) >= 1.701
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.0}
+%{?with_kernelsrc:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source >= 3:3.0}}
+BuildRequires:	rpmbuild(macros) >= 1.746
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -59,7 +57,6 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 %dir /lib/modules/%{_kernel_ver}/kernel/lttng/lib\
 /lib/modules/%{_kernel_ver}/kernel/lttng/lib/lttng-lib-ring-buffer.ko*\
 %dir /lib/modules/%{_kernel_ver}/kernel/lttng/probes\
-%{?with_ftrace:/lib/modules/%{_kernel_ver}/kernel/lttng/probes/lttng-ftrace.ko*}\
 /lib/modules/%{_kernel_ver}/kernel/lttng/probes/lttng-kprobes.ko*\
 /lib/modules/%{_kernel_ver}/kernel/lttng/probes/lttng-kretprobes.ko*\
 /lib/modules/%{_kernel_ver}/kernel/lttng/probes/lttng-probe-*.ko*\
@@ -93,7 +90,6 @@ p=`pwd`\
 %setup -qc
 cd  %{pname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 cd  %{pname}-%{version}