lttng-tools: bump version to 2.2.0
PATCH 1/8 lttng-tools: bump version to 2.2.0
Remove lttng-tools-no-sync-file-range-in-uclibc.patch because it got merged upstream.
--- .../lttng-tools-no-sync-file-range-in-uclibc.patch | 51 ---------------------- package/lttng-tools/lttng-tools.mk | 2 +- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch deleted +0 -51
@@ -1,51 +0,0 @@ -Make sync_file_range() usage optional - -Under uClibc, sync_file_range() is not available under all -architectures, so we fall back to fdatasync() in this case. - -Inspired by the patch done by Thomas Petazzoni for the -2.0-pre25 version. - -Signed-off-by: Samuel Martin <[email protected]> ---- - configure.ac | 2 +- - src/common/compat/fcntl.h | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 5808c79..065b9cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -150,7 +150,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [ - ) - ]) - AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes]) --AC_CHECK_FUNCS([sched_getcpu sysconf]) -+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) - - # check for dlopen - AC_CHECK_LIB([dl], [dlopen], -@@ -394,4 +394,3 @@ AS_IF([test "x$consumerd_only" = "xno"],[ - ]) - - AS_ECHO() -- -diff --git a/src/common/compat/compat-fcntl.c b/src/common/compat/compat-fcntl.c -index 5a1c757..7ff63a3 100644 ---- a/src/common/compat/compat-fcntl.c -+++ b/src/common/compat/compat-fcntl.c -@@ -23,7 +23,11 @@ - int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes, - unsigned int flags) - { -+#ifdef HAVE_SYNC_FILE_RANGE - return sync_file_range(fd, offset, nbytes, flags); -+#else -+ return fdatasync(fd); -+#endif - } - - #endif /* __linux__ */ --- -1.8.0.3 -
package/lttng-tools/lttng-tools.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.1.1 +LTTNG_TOOLS_VERSION = 2.2.0 LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools/ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
Signature · 1 line
1.8.3.1
PATCH 2/8 lttng-modules: bump version to 2.2.0
--- package/lttng-modules/lttng-modules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-modules/lttng-modules.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.1.2 +LTTNG_MODULES_VERSION = 2.2.0 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules/ LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
Signature · 1 line
1.8.3.1
PATCH 3/8 lttng-libust: bump version to 2.2.0
In reply to Samuel Martin--- package/lttng-libust/lttng-libust.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-libust/lttng-libust.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust/ -LTTNG_LIBUST_VERSION = 2.1.3 +LTTNG_LIBUST_VERSION = 2.2.0 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_INSTALL_STAGING = YES
Signature · 1 line
1.8.3.1
PATCH 4/8 liburcu: define license
In reply to Samuel Martin--- package/liburcu/liburcu.mk | 2 ++ 1 file changed, 2 insertions(+)
package/liburcu/liburcu.mk +2 -0
@@ -7,6 +7,8 @@ LIBURCU_VERSION = 0.7.7 LIBURCU_SITE = http://lttng.org/files/urcu/ LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 +LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE +LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt LICENSE LIBURCU_INSTALL_STAGING = YES
Signature · 1 line
1.8.3.1
PATCH 5/8 lttng-babeltrace: define license
In reply to Samuel Martin--- package/lttng-babeltrace/lttng-babeltrace.mk | 2 ++ 1 file changed, 2 insertions(+)
package/lttng-babeltrace/lttng-babeltrace.mk +2 -0
@@ -7,6 +7,8 @@ LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace/ LTTNG_BABELTRACE_VERSION = 1.1.1 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 +LTTNG_BABELTRACE_LICENSE = MIT; LGPLv2 for include/babeltrace/list.h; GPLv3+ for formats/ctf/metadata/ctf-parser.h +LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt LICENSE LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
Signature · 1 line
1.8.3.1
PATCH 6/8 lttng-libust: define license
In reply to Samuel Martin--- package/lttng-libust/lttng-libust.mk | 2 ++ 1 file changed, 2 insertions(+)
package/lttng-libust/lttng-libust.mk +2 -0
@@ -7,6 +7,8 @@ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust/ LTTNG_LIBUST_VERSION = 2.2.0 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 +LTTNG_LIBUST_LICENSE = LGPLv2.1; GPLv2 for lttng-gen-tp and ust-ctl +LTTNG_LIBUST_LICENSE_FILES = COPYING LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
Signature · 1 line
1.8.3.1
PATCH 7/8 lttng-modules: define license
In reply to Samuel Martin--- package/lttng-modules/lttng-modules.mk | 2 ++ 1 file changed, 2 insertions(+)
package/lttng-modules/lttng-modules.mk +2 -0
@@ -7,6 +7,8 @@ LTTNG_MODULES_VERSION = 2.2.0 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules/ LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 +LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/* +LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE LTTNG_MODULES_DEPENDENCIES = linux
Signature · 1 line
1.8.3.1
PATCH 8/8 lttng-tools: define license
In reply to Samuel Martin--- package/lttng-tools/lttng-tools.mk | 3 +++ 1 file changed, 3 insertions(+)
package/lttng-tools/lttng-tools.mk +3 -0
@@ -7,6 +7,9 @@ LTTNG_TOOLS_VERSION = 2.2.0 LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools/ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 +LTTNG_TOOLS_LICENSE = GPLv2; LGPLv2.1 for include/lttng/* and src/lib/lttng-ctl/* +# gpl-2.0.txt and lgpl-2.1.txt files are missing from the sources +LTTNG_TOOLS_LICENSE_FILES = LICENSE # The host-lttng-babeltrace technically isn't a required build # dependency. However, having the babeltrace utilities built for the
Signature · 1 line
1.8.3.1
PATCH 1/8 lttng-tools: bump version to 2.2.0
In reply to Samuel MartinQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
Samuel> Remove lttng-tools-no-sync-file-range-in-uclibc.patch because it got Samuel> merged upstream.
I don't know if it is the mailing list acting up, but I only see patch 1, 2 and 7 here on the list and in patchwork?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/8 lttng-tools: bump version to 2.2.0
In reply to Samuel MartinQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
Samuel> Remove lttng-tools-no-sync-file-range-in-uclibc.patch because it got Samuel> merged upstream.
Committed series, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/8 lttng-tools: bump version to 2.2.0
In reply to Samuel MartinQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
Samuel> Remove lttng-tools-no-sync-file-range-in-uclibc.patch because it got Samuel> merged upstream.
Samuel> Signed-off-by: Samuel Martin <[email protected]>
Samuel> index 77bf7d6..992ecad 100644
Samuel> --- a/package/lttng-tools/lttng-tools.mk
Samuel> +++ b/package/lttng-tools/lttng-tools.mk
Samuel> @@ -4,7 +4,7 @@
Samuel> #
Samuel> ################################################################################
Samuel> -LTTNG_TOOLS_VERSION = 2.1.1
Samuel> +LTTNG_TOOLS_VERSION = 2.2.0
It seems like it has grown a libuuid dependency. Care to have a look?
http://autobuild.buildroot.net/results/fa2/fa2d699901b72d36c5ac3078ef0e7bad2002b9d5/build-end.log
Signature · 1 line
Bye, Peter Korsgaard