- removed dumb build time check

- updated files

diff --git a/build.patch b/build.patch
new file mode 100644 (file)
index 0000000..cddfd99
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,30 @@
+--- lttng-modules-2.5.1/Makefile~      2014-10-20 22:48:47.000000000 +0200
++++ lttng-modules-2.5.1/Makefile       2014-11-09 16:11:25.914717733 +0100
+@@ -5,19 +5,19 @@
+ ifneq ($(KERNELRELEASE),)
+ ifneq ($(CONFIG_TRACEPOINTS),)
+ 
+-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
++#
+ #
+ # 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
+ 
+ obj-m += lttng-ring-buffer-client-discard.o
+ obj-m += lttng-ring-buffer-client-overwrite.o

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 637b40150c28d12c352208988ae5f5c90d4b5cbe..6abde17ba63b578ff01321d3b24857b6a170df02 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -31,6 +31,7 @@ License:      GPL v2
 Group:         Base/Kernel
 Source0:       http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
 # Source0-md5: 2d99bb7311ba92e82e3b675f0b8dee7d
+Patch0:                build.patch
 URL:           http://lttng.org/
 %if %{with dist_kernel}
 BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.38
@@ -73,6 +74,7 @@ Moduły LTTng 2.x dla jądra Linuksa.\
 %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\
+/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*\
@@ -100,6 +102,7 @@ p=`pwd`\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 %build
 %{expand:%bkpkg}