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

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 24e87c6..fc228d6 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,93 +1,107 @@
 #
 # 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_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)
-#
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine	with_userspace
-%endif
 
-%define		rel		7
-%define		pname		lttng-modules
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
+
+%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.2.1
-Release:	%{rel}
+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:	a659eac662d8a5e6084a4ec9897c8250
-URL:		http://lttng.org/
-%if %{with dist_kernel}
-BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.38
-%{?with_allprobes:BuildRequires:	kernel%{_alt_kernel}-source >= 3:2.6.38}
-%endif
-BuildRequires:	rpmbuild(macros) >= 1.379
+Source0:	https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
+# Source0-md5:	46ec6c566e65cf27b391a1bb643e11b4
+Patch0:		build.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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_enable_debug_packages	0
-
 %description
 LTTng 2.x kernel modules.
 
 %description -l pl.UTF-8
 Moduły jądra LTTng 2.x.
 
-%package -n kernel%{_alt_kernel}-lttng
-Summary:	LTTng 2.x modules for Linux kernel
-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
+%define	kernel_pkg()\
+%package -n kernel%{_alt_kernel}-lttng\
+Summary:	LTTng 2.x modules for Linux kernel\
+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\
+%requires_releq_kernel\
+Requires(postun):	%releq_kernel\
+\
+%description -n kernel%{_alt_kernel}-lttng\
+LTTng 2.x modules for Linux kernel.\
+\
+%description -n kernel%{_alt_kernel}-lttng -l pl.UTF-8\
+Moduły LTTng 2.x dla jądra Linuksa.\
+\
+%files -n kernel%{_alt_kernel}-lttng\
+%defattr(644,root,root,755)\
+%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\
+%{?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*\
+\
+%post	-n kernel%{_alt_kernel}-lttng\
+%depmod %{_kernel_ver}\
+\
+%postun	-n kernel%{_alt_kernel}-lttng\
+%depmod %{_kernel_ver}\
+%{nil}
 
-%description -n kernel%{_alt_kernel}-lttng
-LTTng 2.x modules for Linux kernel.
+%define build_kernel_pkg()\
+%{__make} clean \\\
+	KERNELDIR=%{_kernelsrcdir}\
+%{__make} \\\
+	KERNELDIR=%{_kernelsrcdir}\
+p=`pwd`\
+%{__make} modules_install \\\
+	INSTALL_MOD_PATH=$p/../installed \\\
+	INSTALL_MOD_DIR=kernel/lttng \\\
+	KERNELDIR=%{_kernelsrcdir}\
+%{nil}
 
-%description -n kernel%{_alt_kernel}-lttng -l pl.UTF-8
-Moduły LTTng 2.x dla jądra Linuksa.
+%{expand:%create_kernel_packages}
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -qc
+cd  %{pname}-%{version}
+%patch0 -p1
 
 %build
-%{__make} \
-	KERNELDIR=%{_kernelsrcdir} \
-	EXTCFLAGS="%{rpmcflags}"
+cd  %{pname}-%{version}
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT
 
-%{__make} modules_install \
-	INSTALL_MOD_PATH=$RPM_BUILD_ROOT \
-	INSTALL_MOD_DIR=kernel/lttng \
-	KERNELDIR=%{_kernelsrcdir}
+cp -a installed/* $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
-%post	-n kernel%{_alt_kernel}-lttng
-%depmod %{_kernel_ver}
-
-%postun	-n kernel%{_alt_kernel}-lttng
-%depmod %{_kernel_ver}
-
-%files -n kernel%{_alt_kernel}-lttng
-%defattr(644,root,root,755)
-%doc ChangeLog LICENSE README TODO
-%dir /lib/modules/%{_kernel_ver}/kernel/lttng
-/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-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*