X-Git-Url: https://git.pld-linux.org/?p=packages%2Flttng-modules.git;a=blobdiff_plain;f=lttng-modules.spec;h=fc228d69646d60415bbce8425809cfe0ea00d7a4;hp=4f87815cd9e1a9f6b5559c4535f4c836d548c723;hb=b91196d;hpb=e3bbd49ee39d879eaa2959cbd3e43aea23c15197 diff --git a/lttng-modules.spec b/lttng-modules.spec index 4f87815..fc228d6 100644 --- a/lttng-modules.spec +++ b/lttng-modules.spec @@ -7,17 +7,17 @@ # 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.10.12 +Version: 2.11.0 Release: %{rel}@%{_kernel_ver_str} License: GPL v2 Group: Base/Kernel Source0: https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2 -# Source0-md5: 844b5a94cd6bf5c26c5980f99b96750c +# Source0-md5: 46ec6c566e65cf27b391a1bb643e11b4 Patch0: build.patch URL: https://lttng.org/ %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.38} @@ -49,7 +49,7 @@ 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*\ @@ -62,6 +62,7 @@ Moduły LTTng 2.x dla jądra Linuksa.\ /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 +75,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 +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