Skip to contentSkip to conversation

lttng: update remaining recipes

PATCH In review Tom Zanussi 2 participants 4 messages Aug 29, 2013

lore
Share & tools
lore
#0 lore raw

cover lttng: update remaining recipes

lttng-modules was updated a couple days ago to fix a build problem with the new kernel; this patchset adds the remaining updates for the other recipes for the corresponding lttng "Cuda" release.

Tested on crownbay hardware using the examples described in the Yocto Tracing and Profiling Manual:

http://www.yoctoproject.org/docs/latest/profile-manual/profile-manual.html#lttng-linux-trace-toolkit-next-generation

The following changes since commit 5745e45b18e5099e94b4d5a73bc97dc6d4cdc91f:

buildtools-tarball: Add python-pkgutil (2013-08-29 00:23:20 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib.git tzanussi/lttng-remainder-update
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/lttng-remainder-update

Tom Zanussi (2):
lttng-tools: Update to version 2.2.3
lttng-ust: Update to version 2.2.1

 .../{lttng-tools_2.2.0.bb => lttng-tools_2.2.3.bb} |  4 +--
 .../lttng-ust/build-Fix-out-of-tree-build.patch    | 28 --------------------
 .../lttng-ust/depends-liblttng-ust-tracepoin.patch | 30 ----------------------
 .../{lttng-ust_2.2.0.bb => lttng-ust_2.2.1.bb}     |  6 ++---
 4 files changed, 4 insertions(+), 64 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-tools_2.2.0.bb => lttng-tools_2.2.3.bb} (93%)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch
 rename meta/recipes-kernel/lttng/{lttng-ust_2.2.0.bb => lttng-ust_2.2.1.bb} (84%)
Signature · 1 line
1.7.11.4
#1 lore raw

PATCH 1/2 lttng-tools: Update to version 2.2.3

Update lttng-tools to version 2.2.3 to correspond to the LTTng 2.2 "Cuda" - Tracer toolchain stable release.

---
 .../lttng/{lttng-tools_2.2.0.bb => lttng-tools_2.2.3.bb}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-tools_2.2.0.bb => lttng-tools_2.2.3.bb} (93%)
meta/recipes-kernel/lttng/lttng-tools_2.2.3.bb renamed from meta/recipes-kernel/lttng/lttng-tools_2.2.0.bb +2 -2
similarity index 93%
rename from meta/recipes-kernel/lttng/lttng-tools_2.2.0.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.2.3.bb
index e664d85..9872170 100644
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
 
 DEPENDS = "liburcu popt lttng-ust"
 
-SRCREV = "eff0b2c38d24092c41bbb51926ac4e3b8c6acb83"
-PV = "v2.2.0"
+SRCREV = "b1ebf16ce065a35149c39bc4f56ace3671706860"
+PV = "v2.2.3"
 
 SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git"
 
Signature · 1 line
1.7.11.4
#2 lore raw

PATCH 2/2 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.

---
 .../lttng-ust/build-Fix-out-of-tree-build.patch    | 28 --------------------
 .../lttng-ust/depends-liblttng-ust-tracepoin.patch | 30 ----------------------
 .../{lttng-ust_2.2.0.bb => lttng-ust_2.2.1.bb}     |  6 ++---
 3 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch
 rename meta/recipes-kernel/lttng/{lttng-ust_2.2.0.bb => lttng-ust_2.2.1.bb} (84%)
meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch deleted +0 -28
deleted file mode 100644
index cc3220a..0000000
@@ -1,28 +0,0 @@
-From d5a822fbeaec69e86c6af1f0ab8db0ff030f6678 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <[email protected]>
-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 <[email protected]>
----
- 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
-
meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch deleted +0 -30
deleted file mode 100644
index 458a8d4..0000000
@@ -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 <[email protected]>
----
- 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
-
meta/recipes-kernel/lttng/lttng-ust_2.2.1.bb renamed from meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb +2 -4
similarity index 84%
rename from meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.2.1.bb
index d03f207..601aabb 100644
@@ -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;protocol=git \
-	   file://depends-liblttng-ust-tracepoin.patch \
-	   file://build-Fix-out-of-tree-build.patch \
 	   "
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.7.11.4
#3 lore raw

Re: [PATCH 2/2] lttng-ust: Update to version 2.2.1

Quoted 7 lines · Tom Zanussi

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.

I fully agree with the patch; I didn't try them tough.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750