X-Git-Url: https://git.pld-linux.org/?p=packages%2Flttng-modules.git;a=blobdiff_plain;f=lttng-modules.spec;h=fc228d69646d60415bbce8425809cfe0ea00d7a4;hp=1188cc3142878af2f72e5b501a852b326f6b2b9d;hb=b91196d;hpb=185a1fe86d49c3d3ced1630a55f8b88b30a18d5b

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 1188cc3..fc228d6 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,26 +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	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.6.0
+Version:	2.11.0
 Release:	%{rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5:	a058ab037daaca293a54934d7b9f9c98
+Source0:	https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
+# Source0-md5:	46ec6c566e65cf27b391a1bb643e11b4
 Patch0:		build.patch
-URL:		http://lttng.org/
+URL:		https://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)
 
@@ -48,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,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*\
+/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}\
@@ -70,12 +75,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}
@@ -83,10 +89,12 @@ p=`pwd`\
 %{expand:%create_kernel_packages}
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -qc
+cd  %{pname}-%{version}
 %patch0 -p1
 
 %build
+cd  %{pname}-%{version}
 %{expand:%build_kernel_packages}
 
 %install