- up to 2.10.5

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

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 423b244a8f6807c0a980e68a37ee38613970f9d8..5e1a31f4340a013a34ab25269fc53aa934ad367f 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,28 +1,27 @@
 #
 # Conditional build:
-%bcond_without allprobes       # all probes build (some probes, e.g. fs, need full kernel source)
+%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.5.2
+Version:       2.10.5
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5: 74d2fd161fdbf3426c6af5a36a774d4a
+# Source0-md5: 4aaabaafd15d9455c83972e26ccfbca7
 Patch0:                build.patch
-Patch1:                linux-3.17.patch
-Patch2:                linux-3.18.patch
 URL:           http://lttng.org/
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.38}
-%{?with_allprobes:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source >= 3:2.6.38}}
+%{?with_kernelsrc:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source >= 3:2.6.38}}
 BuildRequires: rpmbuild(macros) >= 1.701
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -50,19 +49,22 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 \
 %files -n kernel%{_alt_kernel}-lttng\
 %defattr(644,root,root,755)\
-%doc ChangeLog LICENSE README TODO\
+%doc 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*\
 %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*\
+%{?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-types.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}\
@@ -73,8 +75,7 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 
 %define build_kernel_pkg()\
 %{__make} \\\
-       KERNELDIR=%{_kernelsrcdir} \\\
-       EXTCFLAGS="%{rpmcflags}"\
+       KERNELDIR=%{_kernelsrcdir}\
 p=`pwd`\
 %{__make} modules_install \\\
        INSTALL_MOD_PATH=$p/installed \\\
@@ -87,8 +88,6 @@ p=`pwd`\
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{expand:%build_kernel_packages}