Pull request for branch for-master/lttng

index 0bfba37..b4a4424 100644
@@ -3,7 +3,7 @@
 # liburc: userspace RCU (read-copy-update) library
 #
 #############################################################
-LIBURCU_VERSION = 0.7.5
+LIBURCU_VERSION = 0.7.6
 LIBURCU_SITE    = http://lttng.org/files/urcu/
 LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 

deleted file mode 100644
index 73d0884..0000000
@@ -1,82 +0,0 @@
-From 49c336c1679295a31b92223dca05feccfe3e3464 Mon Sep 17 00:00:00 2001
-From: David Goulet <[email protected]>
-Date: Fri, 9 Nov 2012 13:37:25 -0500
-Subject: [PATCH] Support new lttng-ust error code
-
-Signed-off-by: David Goulet <[email protected]>
----
-
-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 <[email protected]>
-+ *                      Julien Desfossez <[email protected]>
-+ *                      Mathieu Desnoyers <[email protected]>
-+ *
-+ * 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
-

51 lines not on this page · raw message

index 18477ba..5be3abb 100644
@@ -3,7 +3,7 @@
 # LTTng-Tools: the trace control client
 #
 #############################################################
-LTTNG_TOOLS_VERSION = 2.1.0
+LTTNG_TOOLS_VERSION = 2.1.1
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 

index e1f51b1..e143118 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
-LTTNG_LIBUST_VERSION = 2.1.0
+LTTNG_LIBUST_VERSION = 2.1.1
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 
 LTTNG_LIBUST_INSTALL_STAGING = YES

index 60b8a93..82376a3 100644
@@ -1,5 +1,5 @@
 LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace/
-LTTNG_BABELTRACE_VERSION = 1.0.0
+LTTNG_BABELTRACE_VERSION = 1.0.2
 LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2