diff options
author | Ross Burton <ross.burton@arm.com> | 2023-12-21 17:01:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-23 08:46:00 +0000 |
commit | 60ce68180a6b28d093994981c84ff945b41c8f3d (patch) | |
tree | 9dd1f73a47f2d3c111669a86fa9cbd97a2619584 | |
parent | b5a465e61480460001a6dab047ffe70ee1430927 (diff) | |
download | poky-60ce68180a6b28d093994981c84ff945b41c8f3d.tar.gz |
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 <ross.burton@arm.com>
Link: https://lore.kernel.org/r/20231221170159.1995650-1-ross.burton@arm.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-recipe/nativesdk.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
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" | |||
15 | LIBCOVERRIDE = ":${NATIVESDKLIBC}" | 15 | LIBCOVERRIDE = ":${NATIVESDKLIBC}" |
16 | CLASSOVERRIDE = "class-nativesdk" | 16 | CLASSOVERRIDE = "class-nativesdk" |
17 | MACHINEOVERRIDES = "" | 17 | MACHINEOVERRIDES = "" |
18 | |||
18 | MACHINE_FEATURES = "" | 19 | MACHINE_FEATURES = "" |
20 | DISTRO_FEATURES_BACKFILL = "" | ||
21 | MACHINE_FEATURES_BACKFILL = "" | ||
19 | 22 | ||
20 | MULTILIBS = "" | 23 | MULTILIBS = "" |
21 | 24 | ||