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 <ross.burton@arm.com>
Link: https://lore.kernel.org/r/20231221170159.1995650-2-ross.burton@arm.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-recipe/nativesdk.bbclass b/meta/classes-recipe/nativesdk.bbclass
index ccaf411f0d74f0ef407236920074a3e7e7718c71..de6debda93cf1ba0d94c333d618867c602e41983 100644 (file)
--- 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 b3f1f18a0d709a11971939d8e02a123f7f9de770..95d4bd95c83f8bd902e5f33fefcfa6035ab5f2db 100644 (file)
--- 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 ?= ""