X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lttng-modules.spec;h=35869bf326313c2d89e204cb2a24450649d78d7f;hb=1d12a08ee727f087cd39ea63697f909070e320b2;hp=dfb9e7ad7617c00c90c5ae1bf338e52f25cce8d1;hpb=a48baa1bbf26fd93df0fb9dd82169bb8ce3adb58;p=packages%2Flttng-modules.git

diff --git a/lttng-modules.spec b/lttng-modules.spec
index dfb9e7a..35869bf 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,28 +1,27 @@
 #
 # 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	1
+%define		rel	3
 %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.9.0
+Version:	2.13.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:	717df375ccb6f32bb297cc2f2e692bbf
+Source0:	https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
+# Source0-md5:	7f3027cd163f526fd752f3accc89aacb
 Patch0:		build.patch
-URL:		http://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
+URL:		https://lttng.org/
+%{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
@@ -49,19 +48,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*\
@@ -74,11 +77,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}
@@ -86,10 +91,12 @@ p=`pwd`\
 %{expand:%create_kernel_packages}
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -qc -n %{name}-%{version}
+cd  %{pname}-%{version}
 %patch0 -p1
 
 %build
+cd  %{pname}-%{version}
 %{expand:%build_kernel_packages}
 
 %install