summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-11-19 13:48:33 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:09 +0000
commitc375976149ccd499d0e73026a933b3cb071eaff9 (patch)
tree31c24355e93713172e28eb7c0a62f4a5e74e5fa3
parentf5c1b570eb1afde4543ff5431efa5e7cf80df65f (diff)
downloadpoky-contrib-c375976149ccd499d0e73026a933b3cb071eaff9.tar.gz
poky-contrib-c375976149ccd499d0e73026a933b3cb071eaff9.tar.bz2
poky-contrib-c375976149ccd499d0e73026a933b3cb071eaff9.zip
lttng-ust: Upgrade to 2.7 release
(From OE-Core rev: d63f9a33c26dc1536ea4345c76eb49bd1b00f7a7) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch42
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_git.bb10
2 files changed, 4 insertions, 48 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch
deleted file mode 100644
index 03120fe5d69..00000000000
--- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6d02a6c1aeb1d050ffe7c6624bab9acfa76fc05f Mon Sep 17 00:00:00 2001
-From: Mikael Beckius <mikael.beckius@windriver.com>
-Date: Tue, 12 May 2015 11:04:34 +0200
-Subject: [PATCH] lttng-ust:Fix live timer calculation error
-
-There is an calculation error for live timer. Variable chan->switch_timer_interval is
-based on microsecond, and it is not right to assign chan->switch_timer_interval mod
-1000000 to var tv_nsec which is based on nanosecond.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com>
-Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
----
- libringbuffer/ring_buffer_frontend.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
-index eb4e486..e0377a3 100644
---- a/libringbuffer/ring_buffer_frontend.c
-+++ b/libringbuffer/ring_buffer_frontend.c
-@@ -528,7 +528,7 @@ void lib_ring_buffer_channel_switch_timer_start(struct channel *chan)
- }
-
- its.it_value.tv_sec = chan->switch_timer_interval / 1000000;
-- its.it_value.tv_nsec = chan->switch_timer_interval % 1000000;
-+ its.it_value.tv_nsec = (chan->switch_timer_interval % 1000000) * 1000;
- its.it_interval.tv_sec = its.it_value.tv_sec;
- its.it_interval.tv_nsec = its.it_value.tv_nsec;
-
-@@ -582,7 +582,7 @@ void lib_ring_buffer_channel_read_timer_start(struct channel *chan)
- }
-
- its.it_value.tv_sec = chan->read_timer_interval / 1000000;
-- its.it_value.tv_nsec = chan->read_timer_interval % 1000000;
-+ its.it_value.tv_nsec = (chan->read_timer_interval % 1000000) * 1000;
- its.it_interval.tv_sec = its.it_value.tv_sec;
- its.it_interval.tv_nsec = its.it_value.tv_nsec;
-
---
-1.9.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-ust_git.bb b/meta/recipes-kernel/lttng/lttng-ust_git.bb
index ae4afd3d89f..1c08403a324 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_git.bb
@@ -18,14 +18,12 @@ RPROVIDES_${PN} = "lttng2-ust"
RREPLACES_${PN} = "lttng2-ust"
RCONFLICTS_${PN} = "lttng2-ust"
-SRCREV = "c49ee9040ada6984c880756614e8a6f7fd645bd6"
+SRCREV = "826c6c686f16b9aeb3100f3f880d630911691cf1"
PE = "2"
-PV = "2.6.2+git${SRCPV}"
+PV = "2.7.0+git${SRCPV}"
-SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \
- file://lttng-ust-doc-examples-disable.patch \
- file://lttng-ust-Fix-live-timer-calculation-error.patch \
- "
+SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.7 \
+ file://lttng-ust-doc-examples-disable.patch"
S = "${WORKDIR}/git"