- fix building with kernel 5.5.3+

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

diff --git a/lttng-modules.spec b/lttng-modules.spec
index a5096a35e5a23600f0f8c23504b1354c1f968462..c634b14183ed990cbe6bc893d0b871d2931cf154 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,42 +1,29 @@
 #
 # 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}"
-%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     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.3.3
+Version:       2.11.1
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
-Source0:       http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5: 9221ce9e5c8d3bc33819e317ba1df1cd
-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: 0d964723c8765b39835e5e6efc60a604
+Patch0:                build.patch
+Patch1:                kernel-5.5.3.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)
 
 %description
@@ -52,10 +39,8 @@ 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\
 \
 %description -n kernel%{_alt_kernel}-lttng\
 LTTng 2.x modules for Linux kernel.\
@@ -65,18 +50,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 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\
+%{?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}\
@@ -86,23 +76,28 @@ 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}
 
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -qc
+cd  %{pname}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
-%{expand:%bkpkg}
+cd  %{pname}-%{version}
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT