summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-08-29 08:37:02 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-30 16:15:46 +0100
commit3f856556972617560b24cc86bfab027bed83bd49 (patch)
tree070d2430496b52da1c8ec67f56a0900d89ff1a07 /meta/recipes-kernel
parent303abf7f2d8e79e8d14ce5b9aff287347aae43be (diff)
downloadopenembedded-core-3f856556972617560b24cc86bfab027bed83bd49.tar.gz
openembedded-core-3f856556972617560b24cc86bfab027bed83bd49.tar.bz2
openembedded-core-3f856556972617560b24cc86bfab027bed83bd49.zip
lttng-ust: Update to version 2.2.1
Update lttng-ust to version 2.2.1 to correspond to the LTTng 2.2 "Cuda" - Tracer toolchain stable release. This also removes all the local lttng-ust patches, which are now upstream. Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch28
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch30
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.2.1.bb (renamed from meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb)6
3 files changed, 2 insertions, 62 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch b/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
deleted file mode 100644
index cc3220ac18..0000000000
--- a/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d5a822fbeaec69e86c6af1f0ab8db0ff030f6678 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Tue, 2 Jul 2013 10:25:06 -0300
-Subject: [PATCH] build: Fix out-of-tree build
-
-To allow out-of-tree build, we need to include top_buildir in include
-directories or the generated config header won't be found.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- liblttng-ust-comm/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am
-index 2ae997c..065dbbf 100644
---- a/liblttng-ust-comm/Makefile.am
-+++ b/liblttng-ust-comm/Makefile.am
-@@ -1,4 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-
- noinst_LTLIBRARIES = liblttng-ust-comm.la
-
---
-1.8.3.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch b/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch
deleted file mode 100644
index 458a8d47e6..0000000000
--- a/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-liblttng_ust.la should depend on liblttng-ust-tracepoint.la
-
-liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise
-there maybe a parallel build issue:
-
-ld: cannot find -llttng-ust-tracepoint
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- liblttng-ust/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
---- a/liblttng-ust/Makefile.am
-+++ b/liblttng-ust/Makefile.am
-@@ -67,7 +67,8 @@ liblttng_ust_la_LIBADD = \
- -llttng-ust-tracepoint \
- $(top_builddir)/snprintf/libustsnprintf.la \
- $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
-- liblttng-ust-runtime.la liblttng-ust-support.la
-+ liblttng-ust-runtime.la liblttng-ust-support.la \
-+ liblttng-ust-tracepoint.la
-
- if LTTNG_UST_BUILD_WITH_LIBUUID
- liblttng_ust_la_LIBADD += -luuid
---
-1.7.11.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.2.1.bb
index 37b52c4dfb..103264bcc6 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.2.1.bb
@@ -17,13 +17,11 @@ RPROVIDES_${PN} = "lttng2-ust"
RREPLACES_${PN} = "lttng2-ust"
RCONFLICTS_${PN} = "lttng2-ust"
-SRCREV = "cfaee541fea7f5760b5501913c6902f5e4da9dba"
-PV = "2.2.0"
+SRCREV = "481d245409b1caef7fc29790e53584eeb7d1d25d"
+PV = "2.2.1"
PE = "2"
SRC_URI = "git://git.lttng.org/lttng-ust.git \
- file://depends-liblttng-ust-tracepoin.patch \
- file://build-Fix-out-of-tree-build.patch \
"
S = "${WORKDIR}/git"