- rework build dirs to make sure we clean them between building for different kernels

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

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 6697da5c75dbd01b7426431cdc2c02146a204b84..fc228d69646d60415bbce8425809cfe0ea00d7a4 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -7,20 +7,19 @@
 # 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.5
+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: 4aaabaafd15d9455c83972e26ccfbca7
+Source0:       https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
+# Source0-md5: 46ec6c566e65cf27b391a1bb643e11b4
 Patch0:                build.patch
-Patch1:                kernel-4.16.patch
-URL:           http://lttng.org/
+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
@@ -50,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*\
@@ -63,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*\
@@ -75,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}
@@ -87,11 +89,12 @@ p=`pwd`\
 %{expand:%create_kernel_packages}
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -qc
+cd  %{pname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
+cd  %{pname}-%{version}
 %{expand:%build_kernel_packages}
 
 %install