From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 22 Nov 2021 22:27:59 +0000 (-0800)
Subject: image: Include psplash only when screen machine feature is enabled
X-Git-Tag: uninative-3.5~745
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7a6dbad7bf12d2f27f21a81a31a5173cacb49228;p=openembedded-core.git

image: Include psplash only when screen machine feature is enabled

base-image boots in degraded mode when using systems without display
system since there is no fb device detected and pslash service would
fail to start. Removing this image feature means that core-image-base is
complete for headless devices

[RP: tweak the false case so it builds]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6c759fdf70..8a46b4852c 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -53,7 +53,7 @@ FEATURE_INSTALL_OPTIONAL[vardepvalue] = "${FEATURE_INSTALL_OPTIONAL}"
 
 # Define some very basic feature package groups
 FEATURE_PACKAGES_package-management = "${ROOTFS_PKGMANAGE}"
-SPLASH ?= "psplash"
+SPLASH ?= "${@bb.utils.contains("MACHINE_FEATURES", "screen", "psplash", "", d)}"
 FEATURE_PACKAGES_splash = "${SPLASH}"
 
 IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}'