[v2,2/2] image: Include psplash only when screen machine feature is enabled

Message ID 20211122222759.783294-2-raj.khem@gmail.com
State Accepted, archived
Commit 7a6dbad7bf12d2f27f21a81a31a5173cacb49228
Headers show
Series [v2,1/2] core-image-ptest-all,core-image-ptest-fast: Depend on core-image class | expand

Commit Message

Khem Raj Nov. 22, 2021, 10:27 p.m. UTC
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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6c759fdf700..68f8ecfa962 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", "0", d)}"
 FEATURE_PACKAGES_splash = "${SPLASH}"
 
 IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}'