summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-08-29 13:37:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-30 15:23:47 (GMT)
commit8a90c8bdd423b46c2f33e3751fa20a234ea82127 (patch)
treed0314fa50f408ecca280dcceeb5668e9c121617a /meta
parent4c138aa83a3b41f1b4dbc99b6aa7950e61ccaf67 (diff)
downloadpoky-8a90c8bdd423b46c2f33e3751fa20a234ea82127.tar.gz
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. (From OE-Core rev: 3f856556972617560b24cc86bfab027bed83bd49) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 cc3220a..0000000
--- a/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From d5a822fbeaec69e86c6af1f0ab8db0ff030f6678 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 2 Jul 2013 10:25:06 -0300
4Subject: [PATCH] build: Fix out-of-tree build
5
6To allow out-of-tree build, we need to include top_buildir in include
7directories or the generated config header won't be found.
8
9Upstream-Status: Pending
10
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
12---
13 liblttng-ust-comm/Makefile.am | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am
17index 2ae997c..065dbbf 100644
18--- a/liblttng-ust-comm/Makefile.am
19+++ b/liblttng-ust-comm/Makefile.am
20@@ -1,4 +1,4 @@
21-AM_CPPFLAGS = -I$(top_srcdir)/include
22+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
23
24 noinst_LTLIBRARIES = liblttng-ust-comm.la
25
26--
271.8.3.1
28
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 458a8d4..0000000
--- a/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1liblttng_ust.la should depend on liblttng-ust-tracepoint.la
2
3liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise
4there maybe a parallel build issue:
5
6ld: cannot find -llttng-ust-tracepoint
7
8Upstream-Status: Pending
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 liblttng-ust/Makefile.am | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
16--- a/liblttng-ust/Makefile.am
17+++ b/liblttng-ust/Makefile.am
18@@ -67,7 +67,8 @@ liblttng_ust_la_LIBADD = \
19 -llttng-ust-tracepoint \
20 $(top_builddir)/snprintf/libustsnprintf.la \
21 $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
22- liblttng-ust-runtime.la liblttng-ust-support.la
23+ liblttng-ust-runtime.la liblttng-ust-support.la \
24+ liblttng-ust-tracepoint.la
25
26 if LTTNG_UST_BUILD_WITH_LIBUUID
27 liblttng_ust_la_LIBADD += -luuid
28--
291.7.11.2
30
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 37b52c4..103264b 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"
17RREPLACES_${PN} = "lttng2-ust" 17RREPLACES_${PN} = "lttng2-ust"
18RCONFLICTS_${PN} = "lttng2-ust" 18RCONFLICTS_${PN} = "lttng2-ust"
19 19
20SRCREV = "cfaee541fea7f5760b5501913c6902f5e4da9dba" 20SRCREV = "481d245409b1caef7fc29790e53584eeb7d1d25d"
21PV = "2.2.0" 21PV = "2.2.1"
22PE = "2" 22PE = "2"
23 23
24SRC_URI = "git://git.lttng.org/lttng-ust.git \ 24SRC_URI = "git://git.lttng.org/lttng-ust.git \
25 file://depends-liblttng-ust-tracepoin.patch \
26 file://build-Fix-out-of-tree-build.patch \
27 " 25 "
28 26
29S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"