Patchwork [CONSOLIDATED,PULL,8/9] lttng-ust: Update to 0.15

login
register
mail settings
Submitter Saul Wold
Date Aug. 6, 2011, 6:38 a.m.
Message ID <ce602d8e1820d095d0f448908543a17d39f0b489.1312612601.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/9444/
State New, archived
Headers show

Comments

Saul Wold - Aug. 6, 2011, 6:38 a.m.
This address [YOCTO #1005] which was waiting for upstream updates
from the lttng and GDB teams.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../lttng/lttng-ust/uclibc-sched_getcpu.patch      |   50 --------------------
 meta/recipes-kernel/lttng/lttng-ust_0.15.bb        |   27 +++++++++++
 2 files changed, 27 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.15.bb

Patch

diff --git a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch b/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch
deleted file mode 100644
index f4ea196..0000000
--- a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch
+++ /dev/null
@@ -1,50 +0,0 @@ 
-uClibc does not have sched_getcpu() implemented. So we create a wrapper
-to getcpu syscall when compiling for uclibc.
-
-So far execinfo.h does not exist on uclibc but it turns out to be that
-this header is not needed even in eglibc case so it can be removed
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Accepted
-
-Index: ust-0.12/libust/tracer.h
-===================================================================
---- ust-0.12.orig/libust/tracer.h
-+++ ust-0.12/libust/tracer.h
-@@ -342,14 +342,22 @@ static __inline__ void ltt_write_trace_h
- 	header->start_freq = trace->start_freq;
- 	header->freq_scale = trace->freq_scale;
- }
--
-+#ifdef __UCLIBC__
-+#define sched_getcpu(cpu, node, cache) syscall(__NR_getcpu, cpu, node, cache)
-+#endif
- #ifndef UST_VALGRIND
- 
- static __inline__ int ust_get_cpu(void)
- {
- 	int cpu;
- 
-+#ifdef __UCLIBC__
-+	int c, s;
-+	s = syscall(__NR_getcpu, &c, NULL, NULL);
-+	cpu = (s == -1) ? s : c;
-+#else
- 	cpu = sched_getcpu();
-+#endif
- 	if (likely(cpu >= 0))
- 		return cpu;
- 	/*
-Index: ust-0.12/libustcomm/ustcomm.c
-===================================================================
---- ust-0.12.orig/libustcomm/ustcomm.c
-+++ ust-0.12/libustcomm/ustcomm.c
-@@ -31,7 +31,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <execinfo.h>
- 
- #include "ustcomm.h"
- #include "usterr.h"
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.15.bb b/meta/recipes-kernel/lttng/lttng-ust_0.15.bb
new file mode 100644
index 0000000..b0e8596
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust_0.15.bb
@@ -0,0 +1,27 @@ 
+SUMMARY = "Linux Trace Toolkit Userspace Tracer"
+DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code"
+HOMEPAGE = "http://lttng.org/ust"
+BUGTRACKER = "n/a"
+
+LICENSE = "LGPLv2.1+ & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
+                    file://ustctl/ustctl.c;endline=16;md5=b50c6fa0307175bb1ce0db49d752c03b \
+                    file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
+
+DEPENDS = "liburcu"
+
+PR = "r2"
+
+SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz"
+
+S = "${WORKDIR}/ust-${PV}"
+
+inherit autotools
+
+#EXTRA_OECONF = "ac_cv_lib_urcu_bp_synchronize_rcu_bp=no"
+
+# Due to liburcu not building on MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
+