From 60ce68180a6b28d093994981c84ff945b41c8f3d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 21 Dec 2023 17:01:57 +0000 Subject: nativesdk: ensure features don't get backfilled nativesdk aims to run in a slightly different environment than the target build, so it resets MACHINE_FEATURES and filters DISTRO_FEATURES with DISTRO_FEATURES_NATIVESDK. However, feature backfill happens _after_ these operations: $ bitbake-getvar -r nativesdk-glib-2.0 MACHINE_FEATURES # # $MACHINE_FEATURES [5 operations] # set /home/ross/Yocto/poky/meta/conf/machine/include/qemu.inc:14 # "alsa bluetooth usbgadget screen vfat" # set /home/ross/Yocto/poky/meta/conf/documentation.conf:284 # [doc] "Specifies the list of hardware features the MACHINE supports." # set? /home/ross/Yocto/poky/meta/conf/bitbake.conf:893 # "" # set /home/ross/Yocto/poky/meta/classes-recipe/nativesdk.bbclass:18 # "" # append utils.py:132 [features_backfill] # " rtc qemu-usermode" # pre-expansion value: # " rtc qemu-usermode" MACHINE_FEATURES=" rtc qemu-usermode" This is not intentional nor desired as the target machine features are unrelated to the nativesdk environment. (From OE-Core rev: f560ac0a5ccced02b84df337f0f26209cd4b6474) Signed-off-by: Ross Burton Link: https://lore.kernel.org/r/20231221170159.1995650-1-ross.burton@arm.com Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-recipe/nativesdk.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes-recipe/nativesdk.bbclass b/meta/classes-recipe/nativesdk.bbclass index 08288fdb73..ccaf411f0d 100644 --- a/meta/classes-recipe/nativesdk.bbclass +++ b/meta/classes-recipe/nativesdk.bbclass @@ -15,7 +15,10 @@ NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" CLASSOVERRIDE = "class-nativesdk" MACHINEOVERRIDES = "" + MACHINE_FEATURES = "" +DISTRO_FEATURES_BACKFILL = "" +MACHINE_FEATURES_BACKFILL = "" MULTILIBS = "" -- cgit v1.2.3-54-g00ecf