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

Bruce Ashfield bruce.ashfield at windriver.com
Wed Jul 23 03:43:34 UTC 2014 

On 2014-07-22, 11:45 AM, Bruce Ashfield wrote:
> On 14-07-22 11:42 AM, Gabriel Barbu wrote:
>> On 7/22/2014 4:51 PM, Bruce Ashfield wrote:
>>> On 14-07-20 10:02 AM, Martin Jansa wrote:
>>>> On Wed, Jun 18, 2014 at 09:44:25AM +0000, git at git.openembedded.org
>>>> wrote:
>>>>> 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.
>>>>
>>>> We still have lttng-modules 2.3.3 in oe-core which still suffers from
>>>> this issue, can you please drop or fix them?
>>>
>>> I'm currently fighting with 3.16 and lttng .. once I survive my current
>>> battle, I'll see about sorting this out as well.
>>>
>>> Cheers,
>>>
>>> Bruce
>>
>> The reason for which we use the 2.3.3 version is that lttng-modules has
>> blacklisted arm as it was not working with gcc 4.8.
>> However, by implementation it was blacklisted for any gcc version and it
>> still is, even if we are now using gcc 4.9.
>> So I think the solution here would be to remove the blacklist and thus
>> also move to 2.4.1.
>>
>> I tried it for qemuarm and it worked.
>
> I have a 2.4.2 update that also works here, as well as a 2.5, since I
> needed
> to update to get 3.16 working.

I've confirmed the lttng I have here works for ARM, so I'll submit
that on Thursday. I would have sent it tonight, but it looks like we
can get some 3.16 patches from upstream if I hold for a little while ..
so I'll do that, and send during the day if I don't hear anything :)

Cheers,

Bruce

>
> Either way works for me, but I'll be submitting a patch over top of
> anything else shortly.
>
> Cheers,
>
> Bruce
>
>> If you agree I could submit a patch.
>>
>> Best regards,
>>
>> Gabriel
>>
>>>
>>>>
>>>> 2.3.3 is used by default for qemuarm, because of this in 2.4.1:
>>>> # lttng currently blacklists arm with gcc-4.8
>>>> COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips).*-linux'
>>>>
>>>> The issue was already reported 7 times in world status builds.
>>>>
>>>> |   CC [M]
>>>> /home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/probes/lttng-probe-block.o
>>>>
>>>>
>>>>
>>>> | In file included from
>>>> /home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/probes/../instrumentation/events/lttng-module/../../../probes/define_trace.h:148:0,
>>>>
>>>>
>>>>
>>>> |                  from
>>>> /home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/probes/../instrumentation/events/lttng-module/block.h:932,
>>>>
>>>>
>>>>
>>>> |                  from
>>>> /home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/probes/lttng-probe-block.c:41:
>>>>
>>>>
>>>>
>>>> |
>>>> /home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:151:6:
>>>>
>>>>
>>>> error: conflicting types for 'trace_block_rq_complete'
>>>> |  void trace_##_name(_proto);
>>>> |       ^
>>>> |
>>>> /home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/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))
>>>> |   ^
>>>> |
>>>> /home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/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,
>>>> |  ^
>>>> | In file included from include/linux/module.h:18:0,
>>>> |                  from
>>>> /home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/probes/lttng-probe-block.c:23:
>>>>
>>>>
>>>>
>>>> | include/linux/tracepoint.h:168:21: note: previous definition of
>>>> 'trace_block_rq_complete' was here
>>>> |   static inline void trace_##name(proto)    \
>>>> |                      ^
>>>> | include/linux/tracepoint.h:265:3: note: in expansion of macro
>>>> '__DECLARE_TRACE'
>>>> |    __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), 1, \
>>>> |    ^
>>>> | include/linux/tracepoint.h:399:2: note: in expansion of macro
>>>> 'DECLARE_TRACE'
>>>> |   DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
>>>> |   ^
>>>> | include/trace/events/block.h:143:1: note: in expansion of macro
>>>> 'TRACE_EVENT'
>>>> |  TRACE_EVENT(block_rq_complete,
>>>> |  ^
>>>> | make[3]: ***
>>>> [/home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/probes/lttng-probe-block.o]
>>>>
>>>>
>>>> Error 1
>>>> | make[2]: ***
>>>> [/home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git/probes]
>>>>
>>>>
>>>> Error 2
>>>> | make[1]: ***
>>>> [_module_/home/jenkins/oe/world/shr-core/tmp-eglibc/work/qemuarm-oe-linux-gnueabi/lttng-modules/2.3.3-r0/git]
>>>>
>>>>
>>>> Error 2
>>>> | make[1]: Leaving directory
>>>> `/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/src/kernel'
>>>>
>>>>
>>>>
>>>> | make: *** [default] Error 2
>>>>
>>>>>
>>>>> 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
>>>>>
>>>>> --
>>>>> _______________________________________________
>>>>> Openembedded-commits mailing list
>>>>> Openembedded-commits at lists.openembedded.org
>>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
>>>>
>>>
>>
>

More information about the Openembedded-core mailing list