From patchwork Sat Jan 19 11:03:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 213824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 073472C0079 for ; Sat, 19 Jan 2013 22:07:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AE09EA00D4; Sat, 19 Jan 2013 11:07:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FiRzeKmpNrNN; Sat, 19 Jan 2013 11:07:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 339F8A00FC; Sat, 19 Jan 2013 11:07:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 56C168F79A for ; Sat, 19 Jan 2013 11:06:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9A92789F30 for ; Sat, 19 Jan 2013 11:06:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qR+gXGcvjcVW for ; Sat, 19 Jan 2013 11:06:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id E9D9782809 for ; Sat, 19 Jan 2013 11:06:31 +0000 (UTC) Received: by mail-wi0-f171.google.com with SMTP id hn14so5873877wib.10 for ; Sat, 19 Jan 2013 03:06:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references; bh=s6uACoPWDDWihyZLVmdyVs37xe4BXnOMRLCD8Spy1pk=; b=jvqDRe29ODRDOgcnfeYGJcE3KORUUuUFz2HWPB1BCEaamRKiUDRHHRf/OHg4PIfhXk /0c9Oq7F8ebws64b8MCeiFefxs8ar2/720ea2PHYPGTzDtOYDEd/m5A8FbnXMNYBobgr NtRfd/lnplykc737Vxv2S4DAigTDLOzxpaFVyyaQW5D1MpSf5hn9+2m8Vy9UsT2sbW3M ridHPZJ0ABgUx7JgNRUNHDyrv3V9oC4suhVgGnZdKHY6dONeoQZzjHW39Z093U5lx+ze /Sf2Ne6Uz+afeZyMPBLsB71hYA8wNPPB5Rq5sevEgMG1AatmOtFJUK18zyqY1fO9EerB P7Jw== X-Received: by 10.180.24.9 with SMTP id q9mr7641194wif.14.1358593590090; Sat, 19 Jan 2013 03:06:30 -0800 (PST) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPS id t17sm8171990wiv.6.2013.01.19.03.06.29 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 19 Jan 2013 03:06:29 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Sat, 19 Jan 2013 12:03:46 +0100 Message-Id: <3dfae95b8d1f5658adffb68511aaa2b6106d7719.1358593210.git.s.martin49@gmail.com> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 2/4] lttng-tools: bump to version 2.1.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net * remove lttng-tools-Support-new-lttng-ust-error-code.patch (tarball fixed) * remove lttng-tools-no-sync-file-range-in-uclibc.patch (merged upstream) Signed-off-by: Samuel Martin --- ...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 +- 3 files changed, 1 insertion(+), 134 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 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 deleted file mode 100644 index 73d0884..0000000 --- a/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 49c336c1679295a31b92223dca05feccfe3e3464 Mon Sep 17 00:00:00 2001 -From: David Goulet -Date: Fri, 9 Nov 2012 13:37:25 -0500 -Subject: [PATCH] Support new lttng-ust error code - -Signed-off-by: David Goulet ---- - -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 -+ * Julien Desfossez -+ * Mathieu Desnoyers -+ * -+ * 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 -+#include -+ -+#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 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 ---- - 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 18477ba..5be3abb 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.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