From patchwork Mon Jan 21 09:05:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 214048 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id EDEC62C007E for ; Mon, 21 Jan 2013 20:02:17 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9A5E4305D9; Mon, 21 Jan 2013 09:02:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f0uv+XdI85iO; Mon, 21 Jan 2013 09:02:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2E1393040D; Mon, 21 Jan 2013 09:02:15 +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 DDDFC8F753 for ; Mon, 21 Jan 2013 09:02:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 196668BA44 for ; Mon, 21 Jan 2013 09:02:14 +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 lzbVpYOmqzEQ for ; Mon, 21 Jan 2013 09:02:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-bk0-f54.google.com (mail-bk0-f54.google.com [209.85.214.54]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6695E8BAC2 for ; Mon, 21 Jan 2013 09:02:12 +0000 (UTC) Received: by mail-bk0-f54.google.com with SMTP id j10so686473bkw.13 for ; Mon, 21 Jan 2013 01:02:10 -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; bh=pqd2FQSvsEZPuaZM5Sls76g3iMEUHPmJYV7KpPERRS4=; b=c9HtV8DN8DGUi/nurtRqqYE8JDidu0LetuwpG/+SQfPNLu2Z+G7ce5nIYi0QrdVJII NWes1i1eG3CI9wT8se7n5sa2KVtYMXoVJoF1Tp1uC4ba5XNhtz9Al8oE/t6hByDhuzxN qKQ3qxWjmcOz7y6KoRDQXRoPR+kPZg2csrVAqNTGFn7ayL79OBNj16WjRENYLG/xjxgI NztoPZzRW++cbXV2vDuUmCOq/40lCWiYJLdK4AU8ZNeGfW7gJXSO7gDbyyF6XWzHEio1 jZHWgyXxqRumO2h852B9STB4C0RrQWCb5ES1WzRtWwXszseFTR6g9q0PKfaYN2rZKg/b j7xg== X-Received: by 10.204.5.135 with SMTP id 7mr4510930bkv.48.1358758930355; Mon, 21 Jan 2013 01:02:10 -0800 (PST) Received: from localhost.aldebaran.lan (140-85-190-109.dsl.ovh.fr. [109.190.85.140]) by mx.google.com with ESMTPS id u3sm7630517bkw.9.2013.01.21.01.02.08 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jan 2013 01:02:09 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Mon, 21 Jan 2013 10:05:13 +0100 Message-Id: <1358759114-11148-1-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.8.1.1 Subject: [Buildroot] [PATCH 1/2] lttng-tools: fix version bumping to 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 * re-introduce lttng-tools-no-sync-file-range-in-uclibc.patch (merged upstream just after the 2.1.1 release) Signed-off-by: Samuel Martin --- .../lttng-tools-no-sync-file-range-in-uclibc.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch 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 new file mode 100644 index 0000000..fcaaa3e --- /dev/null +++ b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch @@ -0,0 +1,51 @@ +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 +