- drop non-dist kernel support

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

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 01d0ec885168b938ec8452448a4be0878d7c50b3..c78ad65f223f742619be5652b169dea3dad676a1 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,6 +1,5 @@
 #
 # Conditional build:
-%bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_without allprobes       # all probes build (some probes, e.g. fs, need full kernel source)
 %bcond_with    verbose         # verbose build (V=1)
 
@@ -20,19 +19,22 @@ exit 1
 %define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 
-%define                rel     6
+%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.3.0
+Version:       2.5.2
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5: 9c7e9d730020a0b94514eaed0927332a
+# Source0-md5: 74d2fd161fdbf3426c6af5a36a774d4a
+Patch0:                build.patch
+Patch1:                linux-3.17.patch
+Patch2:                linux-3.18.patch
 URL:           http://lttng.org/
-%if %{with dist_kernel}
+%if %{with kernel}
 BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.38
 %{?with_allprobes:BuildRequires:       kernel%{_alt_kernel}-source >= 3:2.6.38}
 %endif
@@ -52,10 +54,8 @@ Summary(pl.UTF-8):   Moduły LTTng 2.x dla jądra Linuksa\
 Release:       %{rel}@%{_kernel_ver_str}\
 Group:         Base/Kernel\
 Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires(postun):      %releq_kernel\
-%endif\
 \
 %description -n kernel%{_alt_kernel}-lttng\
 LTTng 2.x modules for Linux kernel.\
@@ -73,6 +73,7 @@ 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\
+/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*\
@@ -100,6 +101,9 @@ p=`pwd`\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{expand:%bkpkg}