Re: [OE-core] [PATCH] usrmerge: add the distro feature to nativesdk builds when added to target and enable symlink creation for both

Alexandre Belloni
2024-02-06T10:03:44Z

Hello,

This causes failures on the autobuilders:

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/8540/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/5665/steps/12/logs/stdio

On 01/02/2024 02:56:22+0000, Maanya Goenka wrote:
> From: Maanya Goenka <maanyagoenka@microsoft.com>
>
> Add usrmerge to DISTRO_FEATURES_FILTER_NATIVESDK (and DISTRO_FEATURES_FILTER_NATIVE for consistency),
> since we have come across cases where the distro feature would be required by both contexts.
> As a supplement to this change, when creating the merged usr symlinks at the do_populate_sdk stage,
> these need to be created for both the target and native sysroots within the SDK.
>
> Signed-off-by: Maanya Goenka <maanyagoenka@microsoft.com>
> Signed-off-by : Alejandro Hernandez Samaniego <alhe@linux.microsoft.com>
> ---
> meta/classes-recipe/image.bbclass | 2 ++
> meta/conf/bitbake.conf | 4 ++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass
> index 7231fad940..df59133f77 100644
> --- a/meta/classes-recipe/image.bbclass
> +++ b/meta/classes-recipe/image.bbclass
> @@ -653,8 +653,10 @@ create_merged_usr_symlinks_rootfs() {
> create_merged_usr_symlinks ${IMAGE_ROOTFS}
> }
>
> +# Create the usrmerge symlink for the host in addition to the target build
> create_merged_usr_symlinks_sdk() {
> create_merged_usr_symlinks ${SDK_OUTPUT}${SDKTARGETSYSROOT}
> + create_merged_usr_symlinks ${SDK_OUTPUT}${SDKPATHNATIVE}
> }
>
> ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_rootfs', '',d)}"
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 6f180d18b0..ff9f7ab407 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -920,8 +920,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
>
> # Normally target distro features will not be applied to native builds:
> # Native distro features on this list will use the target feature value
> -DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl wayland"
> -DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl wayland"
> +DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl usrmerge wayland"
> +DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl usrmerge wayland"
>
> DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
> MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
> --
> 2.25.1
>

>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#194548): https://lists.openembedded.org/g/openembedded-core/message/194548
> Mute This Topic: https://lists.openembedded.org/mt/104089708/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering