X-Git-Url: https://git.pld-linux.org/?p=packages%2Flttng-modules.git;a=blobdiff_plain;f=lttng-modules.spec;h=c634b14183ed990cbe6bc893d0b871d2931cf154;hp=6c2d8695a2f05a936c8f9c16b5f560ed1728e323;hb=d4618bf;hpb=92b5818b25d73f150ba09a8dbeb0f56d75b46a6c

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 6c2d869..c634b14 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -7,19 +7,20 @@
 # 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
 Name:		%{pname}%{_alt_kernel}
-Version:	2.7.1
+Version:	2.11.1
 Release:	%{rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5:	1603517c2de7e76c9f61e73f1234c818
+Source0:	https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
+# Source0-md5:	0d964723c8765b39835e5e6efc60a604
 Patch0:		build.patch
-URL:		http://lttng.org/
+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
@@ -49,8 +50,9 @@ 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,TODO}\
 %dir /lib/modules/%{_kernel_ver}/kernel/lttng\
+/lib/modules/%{_kernel_ver}/kernel/lttng/lttng-clock.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*\
@@ -61,8 +63,10 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 /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-test.ko*\
-/lib/modules/%{_kernel_ver}/kernel/lttng/probes/lttng-types.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*\
 \
 %post	-n kernel%{_alt_kernel}-lttng\
 %depmod %{_kernel_ver}\
@@ -72,12 +76,13 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 %{nil}
 
 %define build_kernel_pkg()\
+%{__make} clean \\\
+	KERNELDIR=%{_kernelsrcdir}\
 %{__make} \\\
-	KERNELDIR=%{_kernelsrcdir} \\\
-	EXTCFLAGS="%{rpmcflags}"\
+	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}
@@ -85,10 +90,13 @@ p=`pwd`\
 %{expand:%create_kernel_packages}
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -qc
+cd  %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
+cd  %{pname}-%{version}
 %{expand:%build_kernel_packages}
 
 %install