| Message ID | 1372604469-24361-1-git-send-email-s.martin49@gmail.com |
|---|---|
| State | Accepted |
| Commit | ed692e2dbbf8d4751d39a636dd1119e829bd0f99 |
| Headers | show |
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> 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?
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
Samuel> Remove lttng-tools-no-sync-file-range-in-uclibc.patch because it got
Samuel> merged upstream.
Committed series, thanks.
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
Samuel> Remove lttng-tools-no-sync-file-range-in-uclibc.patch because it got
Samuel> merged upstream.
Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
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
diff --git a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch deleted file mode 100644 index fcaaa3e..0000000 --- a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch +++ /dev/null @@ -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 <s.martin49@gmail.com> ---- - 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 - diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 77bf7d6..992ecad 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -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
Remove lttng-tools-no-sync-file-range-in-uclibc.patch because it got merged upstream. Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- .../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