diff mbox series

[kirkstone] lttng-tools: Upgrade 2.13.4 -> 2.13.8

Message ID 20221109011421.1257186-1-xiangyu.chen@eng.windriver.com
State New, archived
Headers show
Series [kirkstone] lttng-tools: Upgrade 2.13.4 -> 2.13.8 | expand

Commit Message

Xiangyu Chen Nov. 9, 2022, 1:14 a.m. UTC
From: Xiangyu Chen <xiangyu.chen@windriver.com>

Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
---
 .../{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb}  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb} (90%)

Comments

Steve Sakoman Nov. 11, 2022, 2:34 p.m. UTC | #1
Master branch is currently at 2.13.7, so you will need to submit the
version bump to 2.13.8 for master first.  I will then cherry-pick the
version bumps to langdale and kirkstone.

Thanks!

Steve

On Tue, Nov 8, 2022 at 3:14 PM Xiangyu Chen
<xiangyu.chen@eng.windriver.com> wrote:
>
> From: Xiangyu Chen <xiangyu.chen@windriver.com>
>
> Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
> ---
>  .../{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb}  | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
>  rename meta/recipes-kernel/lttng/{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb} (90%)
>
> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
> similarity index 90%
> rename from meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
> rename to meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
> index 0ea4da05ce..a814eb79f9 100644
> --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
> @@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
>             file://disable-tests.patch \
>             "
>
> -SRC_URI[sha256sum] = "565f3102410a53d484f4c8ff517978f1dc59f67f9d16f872f4357f3ca12200f6"
> +SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1"
>
>  inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
>
> @@ -113,7 +113,7 @@ do_install_ptest () {
>          for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do
>              cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f
>              case $f in
> -                *.so|userspace-probe-elf-binary)
> +                *.so|userspace-probe-elf-*)
>                      install -d ${D}${PTEST_PATH}/tests/$d/
>                      ln -s  ../$f ${D}${PTEST_PATH}/tests/$d/$f
>                      # Remove any rpath/runpath to pass QA check.
> @@ -124,6 +124,7 @@ do_install_ptest () {
>      done
>
>      chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary
> +    chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary
>      chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so
>      chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so
>
> @@ -185,4 +186,10 @@ do_install_ptest () {
>  INHIBIT_PACKAGE_STRIP_FILES = "\
>      ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \
>      ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \
> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary \
> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/.libs/userspace-probe-elf-cxx-binary \
> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/gen-syscall-events \
> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/.libs/gen-syscall-events \
> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack \
> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/.libs/gen-syscall-events-callstack \
>      "
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#173006): https://lists.openembedded.org/g/openembedded-core/message/173006
> Mute This Topic: https://lists.openembedded.org/mt/94904524/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Xiangyu Chen Nov. 14, 2022, 2:17 a.m. UTC | #2
On 11/11/22 22:34, Steve Sakoman wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> Master branch is currently at 2.13.7, so you will need to submit the
> version bump to 2.13.8 for master first.  I will then cherry-pick the
> version bumps to langdale and kirkstone.
>
> Thanks!
>
> Steve

Hi Steve,


The lttng-tools on master already upgraded to 2.13.8

https://git.openembedded.org/openembedded-core/tree/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb 



Thanks,

Xiangyu

> On Tue, Nov 8, 2022 at 3:14 PM Xiangyu Chen
> <xiangyu.chen@eng.windriver.com> wrote:
>> From: Xiangyu Chen <xiangyu.chen@windriver.com>
>>
>> Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
>> ---
>>   .../{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb}  | 11 +++++++++--
>>   1 file changed, 9 insertions(+), 2 deletions(-)
>>   rename meta/recipes-kernel/lttng/{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb} (90%)
>>
>> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
>> similarity index 90%
>> rename from meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
>> rename to meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
>> index 0ea4da05ce..a814eb79f9 100644
>> --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
>> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
>> @@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
>>              file://disable-tests.patch \
>>              "
>>
>> -SRC_URI[sha256sum] = "565f3102410a53d484f4c8ff517978f1dc59f67f9d16f872f4357f3ca12200f6"
>> +SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1"
>>
>>   inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
>>
>> @@ -113,7 +113,7 @@ do_install_ptest () {
>>           for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do
>>               cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f
>>               case $f in
>> -                *.so|userspace-probe-elf-binary)
>> +                *.so|userspace-probe-elf-*)
>>                       install -d ${D}${PTEST_PATH}/tests/$d/
>>                       ln -s  ../$f ${D}${PTEST_PATH}/tests/$d/$f
>>                       # Remove any rpath/runpath to pass QA check.
>> @@ -124,6 +124,7 @@ do_install_ptest () {
>>       done
>>
>>       chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary
>> +    chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary
>>       chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so
>>       chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so
>>
>> @@ -185,4 +186,10 @@ do_install_ptest () {
>>   INHIBIT_PACKAGE_STRIP_FILES = "\
>>       ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \
>>       ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \
>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary \
>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/.libs/userspace-probe-elf-cxx-binary \
>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/gen-syscall-events \
>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/.libs/gen-syscall-events \
>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack \
>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/.libs/gen-syscall-events-callstack \
>>       "
>> --
>> 2.34.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#173006): https://lists.openembedded.org/g/openembedded-core/message/173006
>> Mute This Topic: https://lists.openembedded.org/mt/94904524/3620601
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
Steve Sakoman Nov. 14, 2022, 2:41 p.m. UTC | #3
On Sun, Nov 13, 2022 at 4:17 PM <xiangyu.chen@eng.windriver.com> wrote:
>
>
> On 11/11/22 22:34, Steve Sakoman wrote:
> > CAUTION: This email comes from a non Wind River email account!
> > Do not click links or open attachments unless you recognize the sender and know the content is safe.
> >
> > Master branch is currently at 2.13.7, so you will need to submit the
> > version bump to 2.13.8 for master first.  I will then cherry-pick the
> > version bumps to langdale and kirkstone.
> >
> > Thanks!
> >
> > Steve
>
> Hi Steve,
>
>
> The lttng-tools on master already upgraded to 2.13.8
>
> https://git.openembedded.org/openembedded-core/tree/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb

You are correct of course :-)  I was mistakenly looking at the version
of lttng-modules when reviewing!

I did try this lttng-tools update previously and encountered ptest issues:

https://lists.openembedded.org/g/openembedded-core/message/172187

If you could fix this I'd be able to take the patch.

Thanks for your help!

Steve

> > On Tue, Nov 8, 2022 at 3:14 PM Xiangyu Chen
> > <xiangyu.chen@eng.windriver.com> wrote:
> >> From: Xiangyu Chen <xiangyu.chen@windriver.com>
> >>
> >> Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
> >> ---
> >>   .../{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb}  | 11 +++++++++--
> >>   1 file changed, 9 insertions(+), 2 deletions(-)
> >>   rename meta/recipes-kernel/lttng/{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb} (90%)
> >>
> >> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
> >> similarity index 90%
> >> rename from meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
> >> rename to meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
> >> index 0ea4da05ce..a814eb79f9 100644
> >> --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
> >> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
> >> @@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
> >>              file://disable-tests.patch \
> >>              "
> >>
> >> -SRC_URI[sha256sum] = "565f3102410a53d484f4c8ff517978f1dc59f67f9d16f872f4357f3ca12200f6"
> >> +SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1"
> >>
> >>   inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
> >>
> >> @@ -113,7 +113,7 @@ do_install_ptest () {
> >>           for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do
> >>               cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f
> >>               case $f in
> >> -                *.so|userspace-probe-elf-binary)
> >> +                *.so|userspace-probe-elf-*)
> >>                       install -d ${D}${PTEST_PATH}/tests/$d/
> >>                       ln -s  ../$f ${D}${PTEST_PATH}/tests/$d/$f
> >>                       # Remove any rpath/runpath to pass QA check.
> >> @@ -124,6 +124,7 @@ do_install_ptest () {
> >>       done
> >>
> >>       chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary
> >> +    chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary
> >>       chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so
> >>       chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so
> >>
> >> @@ -185,4 +186,10 @@ do_install_ptest () {
> >>   INHIBIT_PACKAGE_STRIP_FILES = "\
> >>       ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \
> >>       ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \
> >> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary \
> >> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/.libs/userspace-probe-elf-cxx-binary \
> >> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/gen-syscall-events \
> >> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/.libs/gen-syscall-events \
> >> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack \
> >> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/.libs/gen-syscall-events-callstack \
> >>       "
> >> --
> >> 2.34.1
> >>
> >>
> >> -=-=-=-=-=-=-=-=-=-=-=-
> >> Links: You receive all messages sent to this group.
> >> View/Reply Online (#173006): https://lists.openembedded.org/g/openembedded-core/message/173006
> >> Mute This Topic: https://lists.openembedded.org/mt/94904524/3620601
> >> Group Owner: openembedded-core+owner@lists.openembedded.org
> >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> >> -=-=-=-=-=-=-=-=-=-=-=-
> >>
Xiangyu Chen Nov. 15, 2022, 12:52 a.m. UTC | #4
On 11/14/22 22:41, Steve Sakoman wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On Sun, Nov 13, 2022 at 4:17 PM <xiangyu.chen@eng.windriver.com> wrote:
>>
>> On 11/11/22 22:34, Steve Sakoman wrote:
>>> CAUTION: This email comes from a non Wind River email account!
>>> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>>>
>>> Master branch is currently at 2.13.7, so you will need to submit the
>>> version bump to 2.13.8 for master first.  I will then cherry-pick the
>>> version bumps to langdale and kirkstone.
>>>
>>> Thanks!
>>>
>>> Steve
>> Hi Steve,
>>
>>
>> The lttng-tools on master already upgraded to 2.13.8
>>
>> https://git.openembedded.org/openembedded-core/tree/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
> You are correct of course :-)  I was mistakenly looking at the version
> of lttng-modules when reviewing!
>
> I did try this lttng-tools update previously and encountered ptest issues:
>
> https://lists.openembedded.org/g/openembedded-core/message/172187
>
> If you could fix this I'd be able to take the patch.
>
> Thanks for your help!
>
> Steve

Hi Steve,

Yes, this commit contains the fix of ptest failures, I also did a simple 
test in my local setup, the ptest ran successfully ;p


Thanks,

Xiangyu

>>> On Tue, Nov 8, 2022 at 3:14 PM Xiangyu Chen
>>> <xiangyu.chen@eng.windriver.com> wrote:
>>>> From: Xiangyu Chen <xiangyu.chen@windriver.com>
>>>>
>>>> Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
>>>> ---
>>>>    .../{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb}  | 11 +++++++++--
>>>>    1 file changed, 9 insertions(+), 2 deletions(-)
>>>>    rename meta/recipes-kernel/lttng/{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb} (90%)
>>>>
>>>> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
>>>> similarity index 90%
>>>> rename from meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
>>>> rename to meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
>>>> index 0ea4da05ce..a814eb79f9 100644
>>>> --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
>>>> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
>>>> @@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
>>>>               file://disable-tests.patch \
>>>>               "
>>>>
>>>> -SRC_URI[sha256sum] = "565f3102410a53d484f4c8ff517978f1dc59f67f9d16f872f4357f3ca12200f6"
>>>> +SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1"
>>>>
>>>>    inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
>>>>
>>>> @@ -113,7 +113,7 @@ do_install_ptest () {
>>>>            for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do
>>>>                cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f
>>>>                case $f in
>>>> -                *.so|userspace-probe-elf-binary)
>>>> +                *.so|userspace-probe-elf-*)
>>>>                        install -d ${D}${PTEST_PATH}/tests/$d/
>>>>                        ln -s  ../$f ${D}${PTEST_PATH}/tests/$d/$f
>>>>                        # Remove any rpath/runpath to pass QA check.
>>>> @@ -124,6 +124,7 @@ do_install_ptest () {
>>>>        done
>>>>
>>>>        chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary
>>>> +    chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary
>>>>        chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so
>>>>        chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so
>>>>
>>>> @@ -185,4 +186,10 @@ do_install_ptest () {
>>>>    INHIBIT_PACKAGE_STRIP_FILES = "\
>>>>        ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \
>>>>        ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \
>>>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary \
>>>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/.libs/userspace-probe-elf-cxx-binary \
>>>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/gen-syscall-events \
>>>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/.libs/gen-syscall-events \
>>>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack \
>>>> +    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/.libs/gen-syscall-events-callstack \
>>>>        "
>>>> --
>>>> 2.34.1
>>>>
>>>>
>>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>> Links: You receive all messages sent to this group.
>>>> View/Reply Online (#173006): https://lists.openembedded.org/g/openembedded-core/message/173006
>>>> Mute This Topic: https://lists.openembedded.org/mt/94904524/3620601
>>>> Group Owner: openembedded-core+owner@lists.openembedded.org
>>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
>>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>>
diff mbox series

Patch

diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
similarity index 90%
rename from meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
index 0ea4da05ce..a814eb79f9 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
@@ -39,7 +39,7 @@  SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
            file://disable-tests.patch \
            "
 
-SRC_URI[sha256sum] = "565f3102410a53d484f4c8ff517978f1dc59f67f9d16f872f4357f3ca12200f6"
+SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1"
 
 inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
 
@@ -113,7 +113,7 @@  do_install_ptest () {
         for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do
             cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f
             case $f in
-                *.so|userspace-probe-elf-binary)
+                *.so|userspace-probe-elf-*)
                     install -d ${D}${PTEST_PATH}/tests/$d/
                     ln -s  ../$f ${D}${PTEST_PATH}/tests/$d/$f
                     # Remove any rpath/runpath to pass QA check.
@@ -124,6 +124,7 @@  do_install_ptest () {
     done
 
     chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary
+    chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary
     chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so
     chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so
 
@@ -185,4 +186,10 @@  do_install_ptest () {
 INHIBIT_PACKAGE_STRIP_FILES = "\
     ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \
     ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \
+    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary \
+    ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/.libs/userspace-probe-elf-cxx-binary \
+    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/gen-syscall-events \
+    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/.libs/gen-syscall-events \
+    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack \
+    ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/.libs/gen-syscall-events-callstack \
     "