diff mbox series

[kirkstone] qemu: retain default trace backend if 'ust' is not enabled

Message ID 20250306105643.2292192-1-kai.kang@windriver.com
State Under Review
Delegated to: Steve Sakoman
Headers show
Series [kirkstone] qemu: retain default trace backend if 'ust' is not enabled | expand

Commit Message

Kai March 6, 2025, 10:56 a.m. UTC 
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

The qemu build system enables the 'log' trace backend by default, if no
explicit choice was made with '--enable-trace-backend=CHOICE'.

However, the qemu recipe uses the following PACKAGECONFIG line:
    PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust,"

which means that the 'nop' trace backend will be explicitly selected if the
'ust' feature is not enabled. The 'nop' backend removes almost all trace
points at compile time, and thus basically means 'disable tracing'.

To retain the default trace backend if 'ust' is not enabled, the above
PACKAGECONFIG line should either explicitly fall back to the 'log' backend,
or not provide any value for the 'disabled' case. This commit chooses the
latter to not make any assumption about the upstream default.

(From OE-Core rev: c31396a30dcf17ab23ff4dd5943eef5fba20cba6)

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta/recipes-devtools/qemu/qemu.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steve Sakoman March 8, 2025, 7:41 p.m. UTC | #1 
I'm getting errors on the reproducible build test:

https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/1180/steps/12/logs/stdio

Looks like host paths are leaking into the qemu-src package:

https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20250308-s52sakkc/packages/diff-html/

Steve

On Thu, Mar 6, 2025 at 2:56 AM Kai Kang via lists.openembedded.org
<kai.kang=windriver.com@lists.openembedded.org> wrote:
>
> From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
>
> The qemu build system enables the 'log' trace backend by default, if no
> explicit choice was made with '--enable-trace-backend=CHOICE'.
>
> However, the qemu recipe uses the following PACKAGECONFIG line:
>     PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust,"
>
> which means that the 'nop' trace backend will be explicitly selected if the
> 'ust' feature is not enabled. The 'nop' backend removes almost all trace
> points at compile time, and thus basically means 'disable tracing'.
>
> To retain the default trace backend if 'ust' is not enabled, the above
> PACKAGECONFIG line should either explicitly fall back to the 'log' backend,
> or not provide any value for the 'disabled' case. This commit chooses the
> latter to not make any assumption about the upstream default.
>
> (From OE-Core rev: c31396a30dcf17ab23ff4dd5943eef5fba20cba6)
>
> Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>  meta/recipes-devtools/qemu/qemu.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
> index bee30cd56f..137636ef82 100644
> --- a/meta/recipes-devtools/qemu/qemu.inc
> +++ b/meta/recipes-devtools/qemu/qemu.inc
> @@ -298,7 +298,7 @@ PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2"
>  PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr,"
>  PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph"
>  PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,,"
> -PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust,"
> +PACKAGECONFIG[ust] = "--enable-trace-backend=ust,,lttng-ust,"
>  PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,,"
>  PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp"
>  # libnfs is currently provided by meta-kodi
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#212384): https://lists.openembedded.org/g/openembedded-core/message/212384
> Mute This Topic: https://lists.openembedded.org/mt/111545623/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Kai March 10, 2025, 1:43 a.m. UTC | #2 
On 3/9/25 03:41, Steve Sakoman wrote:
> I'm getting errors on the reproducible build test:
>
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/1180/steps/12/logs/stdio

I am very sorry that makes trouble again. I'll compare with master why 
doesn't affect master branch.

Regards,
Kai

>
> Looks like host paths are leaking into the qemu-src package:
>
> https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20250308-s52sakkc/packages/diff-html/
>
> Steve
>
> On Thu, Mar 6, 2025 at 2:56 AM Kai Kang via lists.openembedded.org
> <kai.kang=windriver.com@lists.openembedded.org> wrote:
>> From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
>>
>> The qemu build system enables the 'log' trace backend by default, if no
>> explicit choice was made with '--enable-trace-backend=CHOICE'.
>>
>> However, the qemu recipe uses the following PACKAGECONFIG line:
>>      PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust,"
>>
>> which means that the 'nop' trace backend will be explicitly selected if the
>> 'ust' feature is not enabled. The 'nop' backend removes almost all trace
>> points at compile time, and thus basically means 'disable tracing'.
>>
>> To retain the default trace backend if 'ust' is not enabled, the above
>> PACKAGECONFIG line should either explicitly fall back to the 'log' backend,
>> or not provide any value for the 'disabled' case. This commit chooses the
>> latter to not make any assumption about the upstream default.
>>
>> (From OE-Core rev: c31396a30dcf17ab23ff4dd5943eef5fba20cba6)
>>
>> Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>>   meta/recipes-devtools/qemu/qemu.inc | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
>> index bee30cd56f..137636ef82 100644
>> --- a/meta/recipes-devtools/qemu/qemu.inc
>> +++ b/meta/recipes-devtools/qemu/qemu.inc
>> @@ -298,7 +298,7 @@ PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2"
>>   PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr,"
>>   PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph"
>>   PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,,"
>> -PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust,"
>> +PACKAGECONFIG[ust] = "--enable-trace-backend=ust,,lttng-ust,"
>>   PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,,"
>>   PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp"
>>   # libnfs is currently provided by meta-kodi
>> --
>> 2.34.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#212384): https://lists.openembedded.org/g/openembedded-core/message/212384
>> Mute This Topic: https://lists.openembedded.org/mt/111545623/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-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index bee30cd56f..137636ef82 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -298,7 +298,7 @@  PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2"
 PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr,"
 PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph"
 PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,,"
-PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust,"
+PACKAGECONFIG[ust] = "--enable-trace-backend=ust,,lttng-ust,"
 PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,,"
 PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp"
 # libnfs is currently provided by meta-kodi