From 14571764b7e046507f81bbe589a9f42c5b16665a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 21 Dec 2023 17:01:58 +0000 Subject: [PATCH] nativesdk: don't unset MACHINE_FEATURES, let machine-sdk/ set it There is actually a use for nativesdk MACHINE_FEATURES; for example qemu-usermode being supported, as this is needed to build profile-guided optimised code. We shouldn't use the target MACHINE_FEATURES for this because the target and the SDK can be entirely different, so instead set the MACHINE_FEATURES in nativesdk.bbclass to SDK_MACHINE_FEATURES (which defaults to "") and let the conf/machine-sdk/*.conf files set that as appropriate. Signed-off-by: Ross Burton Link: https://lore.kernel.org/r/20231221170159.1995650-2-ross.burton@arm.com Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-recipe/nativesdk.bbclass | 2 +- meta/conf/bitbake.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/nativesdk.bbclass b/meta/classes-recipe/nativesdk.bbclass index ccaf411f0d7..de6debda93c 100644 --- a/meta/classes-recipe/nativesdk.bbclass +++ b/meta/classes-recipe/nativesdk.bbclass @@ -16,7 +16,7 @@ LIBCOVERRIDE = ":${NATIVESDKLIBC}" CLASSOVERRIDE = "class-nativesdk" MACHINEOVERRIDES = "" -MACHINE_FEATURES = "" +MACHINE_FEATURES = "${SDK_MACHINE_FEATURES}" DISTRO_FEATURES_BACKFILL = "" MACHINE_FEATURES_BACKFILL = "" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b3f1f18a0d7..95d4bd95c83 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -896,6 +896,8 @@ OES_BITBAKE_CONF = "1" ################################################################## MACHINE_FEATURES ?= "" +SDK_MACHINE_FEATURES ?= "" + DISTRO_FEATURES ?= "" DISTRO_EXTRA_RDEPENDS ?= "" -- 2.47.3