[oe-commits] Bruce Ashfield : lttng-modules: update to 2.4.1-stable latest

git at git.openembedded.org git at git.openembedded.org
Wed Jun 18 09:44:25 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: bb304f306c0f6ee496a75a67c0bb8a6c1e41ddf2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bb304f306c0f6ee496a75a67c0bb8a6c1e41ddf2

Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date:   Tue Jun 17 21:29:51 2014 -0400

lttng-modules: update to 2.4.1-stable latest

The 3.15, and 3.14.5+ kernels introduced a change to trace_block_rq_complete,
which triggers the following build error:

    probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:151:6:
    error: conflicting types for 'trace_block_rq_complete'
    |  void trace_##_name(_proto);
    |       ^
    |
    probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:117:2:
    note: in expansion of macro 'DEFINE_EVENT_MAP'
    |   DEFINE_EVENT_MAP(template, name, name, PARAMS(proto), PARAMS(args))
    |   ^
    |
    probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/block.h:235:1:
    note: in expansion of macro 'DEFINE_EVENT'
    |  DEFINE_EVENT(block_rq_with_error, block_rq_complete,

The lttng 2.4.x-stable branch contains the fix (and several other small fixes), so
we bump the SRCREV to import the change.

Build tested against 3.14 and 3.10.

[YOCTO #6459]

Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb
index 4ef74dd..5e05ffc 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb
@@ -10,7 +10,7 @@ DEPENDS = "virtual/kernel"
 
 inherit module
 
-SRCREV = "afdc6b155161f209fcfadc5288dc017ceab56353"
+SRCREV = "a0383def517e3aebbbcebae61fe2bcfb50d31e71"
 PV = "2.4.1"
 
 # lttng currently blacklists arm with gcc-4.8



More information about the Openembedded-commits mailing list