-#
+
# 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_with verbose # verbose build (V=1)
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%global _build_kernels %{alt_kernel}
-%else
-%global _build_kernels %{?build_kernels:,%{?build_kernels}}
-%endif
-
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%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 5
+%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.13.11
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
-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.678
+Source0: https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
+# Source0-md5: 306dc7994fd020e7a21e0c64d42ee95c
+Patch0: build.patch
+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
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.\
\
%files -n kernel%{_alt_kernel}-lttng\
%defattr(644,root,root,755)\
-%doc ChangeLog LICENSE README 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\
/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}\
%{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}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
-%setup -q -n %{pname}-%{version}
+%setup -qc -n %{name}-%{version}
+cd %{pname}-%{version}
+%patch0 -p1
%build
-%{expand:%bkpkg}
+cd %{pname}-%{version}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT