- up to 2.8.0

diff --git a/build.patch b/build.patch
index 9d477340472122a2898f58396f89caab181b36a3..bc8ba1c78ddb43701f7ba561e79e3af891e253b3 100644 (file)
--- a/build.patch
+++ b/build.patch
@@ -1,30 +1,29 @@
 --- lttng-modules-2.6.3/Makefile.orig  2015-09-14 20:30:29.749794009 +0200
 +++ lttng-modules-2.6.3/Makefile       2015-09-14 20:31:10.693125624 +0200
-@@ -8,8 +8,8 @@
- KERNELDIR = ${LTTNG_KERNELDIR}
- MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
+@@ -8,19 +8,19 @@
  
--lttng_check_linux_version = $(shell pwd)/include/linux/version.h
--lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
-+#lttng_check_linux_version = $(shell pwd)/include/linux/version.h
-+#lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
+   TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))
  
+-  lttng_check_linux_version = $(shell pwd)/include/linux/version.h
+-  lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
++#  lttng_check_linux_version = $(shell pwd)/include/linux/version.h
++#  lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
  
- #
-@@ -17,11 +17,11 @@
- # kernel tree moved to a newer kernel version, only pruned by make
- # distclean.
- #
--ifneq ($(wildcard $(lttng_check_linux_version)),)
--ifneq ($(wildcard $(lttng_check_generated_linux_version)),)
--$(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file)
--endif
--endif
-+#ifneq ($(wildcard $(lttng_check_linux_version)),)
-+#ifneq ($(wildcard $(lttng_check_generated_linux_version)),)
-+#$(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file)
-+#endif
-+#endif
+   #
+   # Check for stale version.h, which can be a leftover from an old Linux
+   # kernel tree moved to a newer kernel version, only pruned by make
+   # distclean.
+   #
+-  ifneq ($(wildcard $(lttng_check_linux_version)),)
+-    ifneq ($(wildcard $(lttng_check_generated_linux_version)),)
+-      $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file)
+-    endif
+-  endif
++#  ifneq ($(wildcard $(lttng_check_linux_version)),)
++#    ifneq ($(wildcard $(lttng_check_generated_linux_version)),)
++#      $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file)
++#    endif
++#  endif
  
- include $(MAKEFILEDIR)/Makefile.ABI.workarounds
+   include $(TOP_LTTNG_MODULES_DIR)/Makefile.ABI.workarounds
  

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 204c99cdf9640e3860d5dc3db1a7cc4b50ad6fb9..c0529fc7f099c1f3dd8cdba69bee748f9b04e3e3 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -12,12 +12,12 @@
 Summary:       LTTng 2.x kernel modules
 Summary(pl.UTF-8):     Moduły jądra LTTng 2.x
 Name:          %{pname}%{_alt_kernel}
-Version:       2.7.2
+Version:       2.8.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: 1e573bdec0a34cb3bc8668621d076343
+# Source0-md5: 310029241e50c67c19236e82b68c56b3
 Patch0:                build.patch
 URL:           http://lttng.org/
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.38}
@@ -51,6 +51,7 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 %defattr(644,root,root,755)\
 %doc 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*\
@@ -61,8 +62,11 @@ 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-test.ko*\
-/lib/modules/%{_kernel_ver}/kernel/lttng/probes/lttng-types.ko*\
+%dir /lib/modules/%{_kernel_ver}/kernel/lttng/tests\
+%dir /lib/modules/%{_kernel_ver}/kernel/lttng/tests/clock-plugin\
+/lib/modules/%{_kernel_ver}/kernel/lttng/tests/clock-plugin/lttng-clock-plugin-test.ko*\
+%dir /lib/modules/%{_kernel_ver}/kernel/lttng/tests/probes\
+/lib/modules/%{_kernel_ver}/kernel/lttng/tests/probes/lttng-test.ko*\
 \
 %post  -n kernel%{_alt_kernel}-lttng\
 %depmod %{_kernel_ver}\
@@ -73,8 +77,7 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 
 %define build_kernel_pkg()\
 %{__make} \\\
-       KERNELDIR=%{_kernelsrcdir} \\\
-       EXTCFLAGS="%{rpmcflags}"\
+       KERNELDIR=%{_kernelsrcdir}\
 p=`pwd`\
 %{__make} modules_install \\\
        INSTALL_MOD_PATH=$p/installed \\\