[packages/lttng-modules] - up to 2.6.3

qboosh qboosh at pld-linux.org
Mon Sep 14 21:20:57 CEST 2015


commit b5a5bc4f6af28c772436c29b272a36fb4e4359a2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 14 21:22:38 2015 +0200

    - up to 2.6.3

 build.patch        | 20 ++++++++++----------
 lttng-modules.spec |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/lttng-modules.spec b/lttng-modules.spec
index 7ffa5bb..33dd7ba 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -11,12 +11,12 @@
 Summary:	LTTng 2.x kernel modules
 Summary(pl.UTF-8):	Moduły jądra LTTng 2.x
 Name:		%{pname}%{_alt_kernel}
-Version:	2.6.2
+Version:	2.6.3
 Release:	%{rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5:	cb603520a802c4bde9bfa93788cbba45
+# Source0-md5:	59a32d9d88af11329d487f80a83a7471
 Patch0:		build.patch
 URL:		http://lttng.org/
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.38}
diff --git a/build.patch b/build.patch
index cddfd99..9d47734 100644
--- a/build.patch
+++ b/build.patch
@@ -1,17 +1,17 @@
---- 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-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)))
  
 -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
+@@ -17,11 +17,11 @@
  # kernel tree moved to a newer kernel version, only pruned by make
  # distclean.
  #
@@ -26,5 +26,5 @@
 +#endif
 +#endif
  
- obj-m += lttng-ring-buffer-client-discard.o
- obj-m += lttng-ring-buffer-client-overwrite.o
+ include $(MAKEFILEDIR)/Makefile.ABI.workarounds
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/b5a5bc4f6af28c772436c29b272a36fb4e4359a2



More information about the pld-cvs-commit mailing list