- fix building for 4.19.312

[packages/lttng-modules.git] / lttng-modules.spec

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 7af93acaf0744747abc94bd5d16c5322f87dae1f..c1c784428f2ac53b82a6eed57ec3e95e7b5b8a97 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,29 +1,28 @@
-#
+
 # 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
 %define                _enable_debug_packages  0
 
-%define                rel     2
+%define                rel     1
 %define                pname   lttng-modules
 Summary:       LTTng 2.x kernel modules
 Summary(pl.UTF-8):     Moduły jądra LTTng 2.x
 Name:          %{pname}%{_alt_kernel}
-Version:       2.10.9
+Version:       2.13.12
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5: 09df0ac2e8f245740a2f32411d10c0d1
+# Source0-md5: d84589cceb5a43bef749b48ab57c3860
 Patch0:                build.patch
-Patch1:                kernel-5.1.patch
+Patch1:                timer_expire_entry.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
@@ -50,19 +49,23 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 \
 %files -n kernel%{_alt_kernel}-lttng\
 %defattr(644,root,root,755)\
-%doc ChangeLog LICENSE README.md TODO\
+%doc %{pname}-%{version}/{ChangeLog,LICENSE,README.md}\
 %dir /lib/modules/%{_kernel_ver}/kernel/lttng\
 /lib/modules/%{_kernel_ver}/kernel/lttng/lttng-clock.ko*\
+/lib/modules/%{_kernel_ver}/kernel/lttng/lttng-counter-client-percpu-32-modular.ko.*\
+/lib/modules/%{_kernel_ver}/kernel/lttng/lttng-counter-client-percpu-64-modular.ko.*\
 /lib/modules/%{_kernel_ver}/kernel/lttng/lttng-ring-buffer-*.ko*\
 /lib/modules/%{_kernel_ver}/kernel/lttng/lttng-statedump.ko*\
 /lib/modules/%{_kernel_ver}/kernel/lttng/lttng-tracer.ko*\
+/lib/modules/%{_kernel_ver}/kernel/lttng/lttng-wrapper.ko*\
 %dir /lib/modules/%{_kernel_ver}/kernel/lttng/lib\
+/lib/modules/%{_kernel_ver}/kernel/lttng/lib/lttng-counter.ko.*\
 /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*\
+/lib/modules/%{_kernel_ver}/kernel/lttng/probes/lttng-uprobes.ko*\
 %dir /lib/modules/%{_kernel_ver}/kernel/lttng/tests\
 /lib/modules/%{_kernel_ver}/kernel/lttng/tests/lttng-clock-plugin-test.ko*\
 /lib/modules/%{_kernel_ver}/kernel/lttng/tests/lttng-test.ko*\
@@ -75,11 +78,13 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 %{nil}
 
 %define build_kernel_pkg()\
+%{__make} clean \\\
+       KERNELDIR=%{_kernelsrcdir}\
 %{__make} \\\
        KERNELDIR=%{_kernelsrcdir}\
 p=`pwd`\
 %{__make} modules_install \\\
-       INSTALL_MOD_PATH=$p/installed \\\
+       INSTALL_MOD_PATH=$p/../installed \\\
        INSTALL_MOD_DIR=kernel/lttng \\\
        KERNELDIR=%{_kernelsrcdir}\
 %{nil}
@@ -87,11 +92,13 @@ p=`pwd`\
 %{expand:%create_kernel_packages}
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -qc -n %{name}-%{version}
+cd %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
 
 %build
+cd  %{pname}-%{version}
 %{expand:%build_kernel_packages}
 
 %install