[Buildroot] [pull request] Pull request for branch for-master/lttng

[Buildroot] [pull request] Pull request for branch for-master/lttng

[Samuel Martin]

Hello,

Here is version bump for Lttng and related packages.

The following changes since commit f1d44593a04ff3be981c8a3b01a502f0b18193ee:

  docs/manual: small fixes and enhancements to adding generic packages (2012-12-30 22:39:13 +0100)

are available in the git repository at:

  git at github.com:tSed/buildroot.git for-master/lttng

for you to fetch changes up to 192d7031d43a55c00114dbb0bc54b697e4baf02e:

  lttng-babeltrace: bump to 1.0.0 (2012-12-30 23:04:51 +0100)

----------------------------------------------------------------
Samuel Martin (4):
      lttng-libust: bump to 2.1.0
      lttng-modules: bump to 2.1.0
      lttng-tools: bump to 2.1.0
      lttng-babeltrace: bump to 1.0.0

 package/lttng-babeltrace/lttng-babeltrace.mk       |  2 +-
 ...t-dont-build-cxx-tests-when-not-available.patch | 13 ++--
 .../lttng-libust-uclibc-sched_getcpu.patch         | 32 ---------
 package/lttng-libust/lttng-libust.mk               |  2 +-
 package/lttng-modules/lttng-modules.mk             |  2 +-
 ...ng-tools-Support-new-lttng-ust-error-code.patch | 82 ++++++++++++++++++++++
 .../lttng-tools-no-sync-file-range-in-uclibc.patch | 51 +++++++-------
 package/lttng-tools/lttng-tools.mk                 |  5 +-
 8 files changed, 122 insertions(+), 67 deletions(-)
 delete mode 100644 package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch
 create mode 100644 package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch

Yours,

--

Samuel

[Buildroot] [PATCH 1/4] lttng-libust: bump to 2.1.0

[Samuel Martin]

Also remove lttng-libust-uclibc-sed_getcpu.patch because it got merged
upstream.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 ...t-dont-build-cxx-tests-when-not-available.patch | 13 +++++----
 .../lttng-libust-uclibc-sched_getcpu.patch         | 32 ----------------------
 package/lttng-libust/lttng-libust.mk               |  2 +-
 3 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch

diff --git a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
index bcc5636..b7e8a8f 100644
--- a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
+++ b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
@@ -38,15 +38,16 @@ index 26227cb..56d84db 100644
 +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
 +
  ## Checks for libraries.
- AC_CHECK_LIB([dl], [dlopen])
- AC_CHECK_LIB([pthread], [pthread_create])
+ AC_CHECK_LIB([dl], [dlopen],
+ [
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e79ab7c..1a8b795 100644
+index 2b12422..7365ce4 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -1,6 +1,10 @@
--SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo hello.cxx
-+SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo
+@@ -1,7 +1,11 @@
+ SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test \
+-		demo hello.cxx daemon
++		demo daemon
  #SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
  
 +if CXX_WORKS
diff --git a/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch b/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch
deleted file mode 100644
index 6536185..0000000
--- a/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-[PATCH] fix build with modern uClibc
-
-uClibc has sched_getcpu since 0.9.33, so the compat workaround should only
-be used for older uClibc versions.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- liblttng-ust/compat.h |    5 +++++
- 1 file changed, 5 insertions(+)
-
-Index: lttng-ust-1.9.2/liblttng-ust/compat.h
-===================================================================
---- lttng-ust-1.9.2.orig/liblttng-ust/compat.h
-+++ lttng-ust-1.9.2/liblttng-ust/compat.h
-@@ -17,6 +17,10 @@
- #include <sys/syscall.h>
- 
- #ifdef __UCLIBC__
-+/* old uClibc versions didn't have sched_getcpu */
-+#if __UCLIBC_MAJOR__ == 0 && \
-+	(__UCLIBC_MINOR__ < 9 || \
-+	 (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32))
- #define __getcpu(cpu, node, cache)	syscall(__NR_getcpu, cpu, node, cache)
- static inline
- int sched_getcpu(void)
-@@ -26,5 +30,6 @@
- 	s = __getcpu(&c, NULL, NULL);
- 	return (s == -1) ? s : c;
- }
-+#endif /* <= 0.9.32 */
- #endif	/* __UCLIBC__ */
- #endif /* _UST_COMPAT_H */
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index cd6c65d..e1f51b1 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
-LTTNG_LIBUST_VERSION = 2.0.3
+LTTNG_LIBUST_VERSION = 2.1.0
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 
 LTTNG_LIBUST_INSTALL_STAGING = YES
-- 
1.8.0.3

[Buildroot] [PATCH 2/4] lttng-modules: bump to 2.1.0

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/lttng-modules/lttng-modules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index a245b19..54ae864 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -3,7 +3,7 @@
 # LTTng-modules: the kernel modules (requires at least Linux 2.6.38)
 #
 #############################################################
-LTTNG_MODULES_VERSION = 2.0.3
+LTTNG_MODULES_VERSION = 2.1.0
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules/
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 
-- 
1.8.0.3

[Buildroot] [PATCH 3/4] lttng-tools: bump to 2.1.0

[Samuel Martin]

* add patch adding src/bin/lttng-sessiond/lttng-ust-error.h which is
  missing in the lttng-tools-2.1.0 release tarball.
* update the sync_file_range patch.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 ...ng-tools-Support-new-lttng-ust-error-code.patch | 82 ++++++++++++++++++++++
 .../lttng-tools-no-sync-file-range-in-uclibc.patch | 51 +++++++-------
 package/lttng-tools/lttng-tools.mk                 |  5 +-
 3 files changed, 112 insertions(+), 26 deletions(-)
 create mode 100644 package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch

diff --git a/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch b/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch
new file mode 100644
index 0000000..73d0884
--- /dev/null
+++ b/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch
@@ -0,0 +1,82 @@
+From 49c336c1679295a31b92223dca05feccfe3e3464 Mon Sep 17 00:00:00 2001
+From: David Goulet <dgoulet@efficios.com>
+Date: Fri, 9 Nov 2012 13:37:25 -0500
+Subject: [PATCH] Support new lttng-ust error code
+
+Signed-off-by: David Goulet <dgoulet@efficios.com>
+---
+
+Only keep the src/bin/lttng-sessiond/lttng-ust-error.h adding part,
+needed to build lttng-tool without the lttng-libust dependency, i.e.
+with --disable-lttng-ust. (Samuel Martin)
+
+---
+ src/bin/lttng-sessiond/lttng-ust-error.h | 56 ++++++++++++++++++++++++++++++++
+ 6 files changed, 75 insertions(+), 13 deletions(-)
+ create mode 100644 src/bin/lttng-sessiond/lttng-ust-error.h
+
+diff --git a/src/bin/lttng-sessiond/lttng-ust-error.h b/src/bin/lttng-sessiond/lttng-ust-error.h
+new file mode 100644
+index 0000000..d83ecb8
+--- /dev/null
++++ b/src/bin/lttng-sessiond/lttng-ust-error.h
+@@ -0,0 +1,56 @@
++#ifndef _LTTNG_UST_ERROR_H
++#define _LTTNG_UST_ERROR_H
++
++/*
++ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
++ *                      Julien Desfossez <julien.desfossez@polymtl.ca>
++ *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; only
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++/*
++ * This header is meant for liblttng and libust internal use ONLY.
++ * These declarations should NOT be considered stable API.
++ */
++
++#include <limits.h>
++#include <unistd.h>
++
++#include "lttng-ust-abi.h"
++
++/*
++ * ustcomm error code.
++ */
++enum lttng_ust_error_code {
++	LTTNG_UST_OK = 0,			/* Ok */
++	LTTNG_UST_ERR = 1024,			/* Unknown Error */
++	LTTNG_UST_ERR_NOENT = 1025,		/* No entry */
++	LTTNG_UST_ERR_EXIST = 1026,     /* Object exists */
++	LTTNG_UST_ERR_INVAL = 1027,     /* Invalid argument */
++	LTTNG_UST_ERR_PERM  = 1028,     /* Permission denied */
++	LTTNG_UST_ERR_NOSYS = 1029,     /* Not implemented */
++
++	/* MUST be last element */
++	LTTNG_UST_ERR_NR,			/* Last element */
++};
++
++/*
++ * Return a human-readable error message for an lttng-ust error code.
++ * code must be a positive value (or 0).
++ */
++extern const char *lttng_ust_strerror(int code);
++
++#endif	/* _LTTNG_UST_ERROR_H */
+-- 
+1.8.0.3
+
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
index 3a1807e..fcaaa3e 100644
--- 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
@@ -16,35 +16,36 @@ diff --git a/configure.ac b/configure.ac
 index 5808c79..065b9cf 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -120,7 +120,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
-
- AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
-
+@@ -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],
-diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h
-index 58c1579..dafb33e 100644
---- a/src/common/compat/fcntl.h
-+++ b/src/common/compat/fcntl.h
-@@ -23,10 +23,15 @@
-
- #ifdef __linux__
-
-+#if defined(HAVE_SYNC_FILE_RANGE)
- extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
- 		unsigned int flags);
- #define lttng_sync_file_range(fd, offset, nbytes, flags) \
- 	compat_sync_file_range(fd, offset, nbytes, flags)
+@@ -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
-+#define lttng_sync_file_range(fd, offset, nbytes, flags) \
-+	fdatasync(fd);
++	return fdatasync(fd);
 +#endif
-
- #elif defined(__FreeBSD__)
-
---
-1.7.10
+ }
+ 
+ #endif /* __linux__ */
+-- 
+1.8.0.3
 
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index fe48ac6..18477ba 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -3,7 +3,7 @@
 # LTTng-Tools: the trace control client
 #
 #############################################################
-LTTNG_TOOLS_VERSION = 2.0.4
+LTTNG_TOOLS_VERSION = 2.1.0
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 
@@ -11,6 +11,9 @@ LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 # dependency. However, having the babeltrace utilities built for the
 # host is very useful, since those tools allow to convert the binary
 # trace format into an human readable format.
+# Since the 2.1.0 release, lttng-tools depends on flex and bison,
+# but they are not added to the dependency list since they are
+# already Buildroot dependencies.
 LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace
 
 LTTNG_AUTORECONF = YES
-- 
1.8.0.3

[Buildroot] [PATCH 4/4] lttng-babeltrace: bump to 1.0.0

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/lttng-babeltrace/lttng-babeltrace.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index dd701df..60b8a93 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -1,5 +1,5 @@
 LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace/
-LTTNG_BABELTRACE_VERSION = 1.0.0-rc6
+LTTNG_BABELTRACE_VERSION = 1.0.0
 LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
-- 
1.8.0.3

[Buildroot] [PATCH 3/4] lttng-tools: bump to 2.1.0

[Thomas Petazzoni]

Dear Samuel Martin,

On Sun, 30 Dec 2012 23:17:46 +0100, Samuel Martin wrote:

> +# Since the 2.1.0 release, lttng-tools depends on flex and bison,
> +# but they are not added to the dependency list since they are
> +# already Buildroot dependencies.

We are not very clear about this: we have packages for host-flex and
host-bison, and they are actually used by some of our packages. But we
also require the user to have flex and bison installed in his
distribution.

Probably something that should be clarified, in one direction or
another.

Best regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 3/4] lttng-tools: bump to 2.1.0

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Dear Samuel Martin,
 Thomas> On Sun, 30 Dec 2012 23:17:46 +0100, Samuel Martin wrote:

 >> +# Since the 2.1.0 release, lttng-tools depends on flex and bison,
 >> +# but they are not added to the dependency list since they are
 >> +# already Buildroot dependencies.

 Thomas> We are not very clear about this: we have packages for host-flex and
 Thomas> host-bison, and they are actually used by some of our packages. But we
 Thomas> also require the user to have flex and bison installed in his
 Thomas> distribution.

 Thomas> Probably something that should be clarified, in one direction or
 Thomas> another.

Yes, it would be good to get rid of the flex/bison deps, and use our own
everywhere if possible.

-- 
Bye, Peter Korsgaard

[Buildroot] [pull request] Pull request for branch for-master/lttng

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Hello,
 Samuel> Here is version bump for Lttng and related packages.

 Samuel> The following changes since commit f1d44593a04ff3be981c8a3b01a502f0b18193ee:

 Samuel>   docs/manual: small fixes and enhancements to adding generic packages (2012-12-30 22:39:13 +0100)

 Samuel> are available in the git repository at:

 Samuel>   git at github.com:tSed/buildroot.git for-master/lttng

 Samuel> for you to fetch changes up to 192d7031d43a55c00114dbb0bc54b697e4baf02e:

 Samuel>   lttng-babeltrace: bump to 1.0.0 (2012-12-30 23:04:51 +0100)

 Samuel> ----------------------------------------------------------------
 Samuel> Samuel Martin (4):
 Samuel>       lttng-libust: bump to 2.1.0
 Samuel>       lttng-modules: bump to 2.1.0
 Samuel>       lttng-tools: bump to 2.1.0
 Samuel>       lttng-babeltrace: bump to 1.0.0

Committed all 4, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [pull request] Pull request for branch for-master/lttng

[Samuel Martin]

Hello,

Here is version bump for LTTng and related packages.

The following changes since commit e81e2770aff61d07306d0448bd434d613ed9afef:

  gd: explictly disable freetype support when not available (2013-01-18 23:22:32 +0100)

are available in the git repository at:

  git at github.com:tSed/buildroot.git for-master/lttng

for you to fetch changes up to 0660c79ae34b8e93da0f9835fd0b4d575e285701:

  lttng-babeltrace: bump to version 1.0.2 (2013-01-19 11:57:15 +0100)

----------------------------------------------------------------
Samuel Martin (4):
      liburcu: bump to version 0.7.6
      lttng-tools: bump to version 2.1.1
      lttng-libust: bump to version 2.1.1
      lttng-babeltrace: bump to version 1.0.2

 package/liburcu/liburcu.mk                         |  2 +-
 package/lttng-babeltrace/lttng-babeltrace.mk       |  2 +-
 package/lttng-libust/lttng-libust.mk               |  2 +-
 ...ng-tools-Support-new-lttng-ust-error-code.patch | 82 ----------------------
 .../lttng-tools-no-sync-file-range-in-uclibc.patch | 51 --------------
 package/lttng-tools/lttng-tools.mk                 |  2 +-
 6 files changed, 4 insertions(+), 137 deletions(-)
 delete mode 100644 package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch
 delete mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch

Yours,

--

Samuel

[Buildroot] [pull request] Pull request for branch for-master/lttng

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Hello,
 Samuel> Here is version bump for LTTng and related packages.

 Samuel> The following changes since commit e81e2770aff61d07306d0448bd434d613ed9afef:

 Samuel>   gd: explictly disable freetype support when not available (2013-01-18 23:22:32 +0100)

 Samuel> are available in the git repository at:

 Samuel>   git at github.com:tSed/buildroot.git for-master/lttng

 Samuel> for you to fetch changes up to 0660c79ae34b8e93da0f9835fd0b4d575e285701:

 Samuel>   lttng-babeltrace: bump to version 1.0.2 (2013-01-19 11:57:15 +0100)

 Samuel> ----------------------------------------------------------------
 Samuel> Samuel Martin (4):
 Samuel>       liburcu: bump to version 0.7.6
 Samuel>       lttng-tools: bump to version 2.1.1
 Samuel>       lttng-libust: bump to version 2.1.1
 Samuel>       lttng-babeltrace: bump to version 1.0.2

Committed all 4, thanks.

-- 
Bye, Peter Korsgaard