From patchwork Fri Oct 19 16:27:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 192772 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 40D6D2C0092 for ; Sat, 20 Oct 2012 03:27:54 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5BCA5A049E; Fri, 19 Oct 2012 16:27:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xNpYSPX6RqV1; Fri, 19 Oct 2012 16:27:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5C9F2A01FD; Fri, 19 Oct 2012 16:27:51 +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 25E428F74A for ; Fri, 19 Oct 2012 16:27:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0255D8B1D8 for ; Fri, 19 Oct 2012 16:27:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gLq3nJU1Y1HI for ; Fri, 19 Oct 2012 16:27:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ob0-f171.google.com (mail-ob0-f171.google.com [209.85.214.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 61A208D50C for ; Fri, 19 Oct 2012 16:27:47 +0000 (UTC) Received: by mail-ob0-f171.google.com with SMTP id 16so784828obc.16 for ; Fri, 19 Oct 2012 09:27:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=TZISF/6og01HKWgbaMy8fiBQ/eE6ZcXICTrMjzDnpGs=; b=OrfKvB7yFWjiAdRvcoEiKrHufomf4vne4SNLUGxlWzzBisS4I85hZ8s35Ko9WRUI8J xsNUrlYrKplqLDMExVTabBOrVUNOaYITZZ+T676CEGoZQ34V0mNLnHgNW5EN1fHpZEKp YkkBeJ/M/TWBMdqeJonyb6K0BdDuyI6TVMWCX/Sqkc4oRtXv0fJECQLkRTAanZusTGZa RIwoTqZB1tQfoRWfulSdfcowEesBumc48zL3zoU2eY9X5XGQV5RQomL+zf4mdUisOa3W sHzwZv51JHRMKP3hYSXG0zND8bkhrwWf8wz6toFjVQE6b7oUpqLYyDm6pUys4j/X43l/ pgzA== MIME-Version: 1.0 Received: by 10.182.179.104 with SMTP id df8mr864421obc.90.1350664067197; Fri, 19 Oct 2012 09:27:47 -0700 (PDT) Received: by 10.60.95.4 with HTTP; Fri, 19 Oct 2012 09:27:47 -0700 (PDT) Date: Fri, 19 Oct 2012 17:27:47 +0100 Message-ID: From: Will Newton To: buildroot@busybox.net Subject: [Buildroot] [PATCH 3/3] package/lttng-babeltrace: Bump version to 1.0.0-rc6. 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Will Newton --- ...beltrace-0.8-no-posix-fallocate-in-uclibc.patch | 37 -------------------- ...g-babeltrace-no-posix-fallocate-in-uclibc.patch | 37 ++++++++++++++++++++ package/lttng-babeltrace/lttng-babeltrace.mk | 11 +----- 3 files changed, 39 insertions(+), 46 deletions(-) delete mode 100644 package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch create mode 100644 package/lttng-babeltrace/lttng-babeltrace-no-posix-fallocate-in-uclibc.patch diff --git a/package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch b/package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch deleted file mode 100644 index d77825f..0000000 --- a/package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch +++ /dev/null @@ -1,37 +0,0 @@ -Do not call posix_fallocate() on uClibc - -uClibc does not implement posix_fallocate(), and posix_fallocate() is -mostly only an hint to the kernel that we will need such or such -amount of space inside a file. So we just don't call posix_fallocate() -when building against uClibc. - -Signed-off-by: Thomas Petazzoni -[Peter: add #include ---- - formats/ctf/ctf.c | 3 +++ - 1 file changed, 3 insertions(+) - -Index: lttng-babeltrace-0.8/formats/ctf/ctf.c -=================================================================== ---- lttng-babeltrace-0.8.orig/formats/ctf/ctf.c -+++ lttng-babeltrace-0.8/formats/ctf/ctf.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -384,9 +385,11 @@ - } - pos->content_size = -1U; /* Unknown at this point */ - pos->packet_size = WRITE_PACKET_LEN; -+#ifndef __UCLIBC__ - off = posix_fallocate(pos->fd, pos->mmap_offset, - pos->packet_size / CHAR_BIT); - assert(off >= 0); -+#endif - pos->offset = 0; - } else { - read_next_packet: diff --git a/package/lttng-babeltrace/lttng-babeltrace-no-posix-fallocate-in-uclibc.patch b/package/lttng-babeltrace/lttng-babeltrace-no-posix-fallocate-in-uclibc.patch new file mode 100644 index 0000000..d77825f --- /dev/null +++ b/package/lttng-babeltrace/lttng-babeltrace-no-posix-fallocate-in-uclibc.patch @@ -0,0 +1,37 @@ +Do not call posix_fallocate() on uClibc + +uClibc does not implement posix_fallocate(), and posix_fallocate() is +mostly only an hint to the kernel that we will need such or such +amount of space inside a file. So we just don't call posix_fallocate() +when building against uClibc. + +Signed-off-by: Thomas Petazzoni +[Peter: add #include +--- + formats/ctf/ctf.c | 3 +++ + 1 file changed, 3 insertions(+) + +Index: lttng-babeltrace-0.8/formats/ctf/ctf.c +=================================================================== +--- lttng-babeltrace-0.8.orig/formats/ctf/ctf.c ++++ lttng-babeltrace-0.8/formats/ctf/ctf.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -384,9 +385,11 @@ + } + pos->content_size = -1U; /* Unknown at this point */ + pos->packet_size = WRITE_PACKET_LEN; ++#ifndef __UCLIBC__ + off = posix_fallocate(pos->fd, pos->mmap_offset, + pos->packet_size / CHAR_BIT); + assert(off >= 0); ++#endif + pos->offset = 0; + } else { + read_next_packet: diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk index 0f3200f..dd701df 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/package/lttng-babeltrace/lttng-babeltrace.mk @@ -1,14 +1,7 @@ -LTTNG_BABELTRACE_SITE = http://lttng.org/files/bundles/20111214/ -LTTNG_BABELTRACE_VERSION = 0.8 +LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace/ +LTTNG_BABELTRACE_VERSION = 1.0.0-rc6 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 -# Needed to fix libtool handling, otherwise the build fails when -# building the ctf-parser-test program, which depends on libctf-ast.so -# which itself depends on libbabeltrace_types.so.0 (and libtool gets -# lost in the middle of this). -LTTNG_BABELTRACE_AUTORECONF = YES -HOST_LTTNG_BABELTRACE_AUTORECONF = YES - LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 $(eval $(autotools-package))