Skip to contentSkip to conversation

core-image-ptest-all,core-image-ptest-fast: Depend on core-image class

PATCH New Khem Raj 1 participant 2 messages Nov 22, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/2 core-image-ptest-all,core-image-ptest-fast: Depend on core-image class

Use the default packages as mentioned in core-image-base without splash since many machines ( e.g. raspberrypi ) add packages to enable wifi/bt via MACHINE_EXTRA_RRECOMMENDS which are essential to boot the system without errors, otherwise there are errors about BT firmware not being found etc. which is then marked as failure and also services like btuart fail to start and it marked as failure in system logs

Using default base package groups addresses this issue amicably

---
 meta/recipes-core/images/core-image-ptest-all.bb  | 3 +--
 meta/recipes-core/images/core-image-ptest-fast.bb | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
meta/recipes-core/images/core-image-ptest-all.bb +1 -2
index 1472451675e..8edd9a2b886 100644
@@ -1,7 +1,6 @@
-inherit features_check
+inherit core-image features_check
 REQUIRED_DISTRO_FEATURES = "ptest"
 
-require core-image-minimal.bb
 require conf/distro/include/ptest-packagelists.inc
 
 DESCRIPTION += "Also includes ptest packages."
meta/recipes-core/images/core-image-ptest-fast.bb +1 -2
index 40df274c4c1..286f20e547c 100644
@@ -1,7 +1,6 @@
-inherit features_check
+inherit core-image features_check
 REQUIRED_DISTRO_FEATURES = "ptest"
 
-require core-image-minimal.bb
 require conf/distro/include/ptest-packagelists.inc
 
 # Include only fast (< 30 sec) ptests
Signature · 1 line
2.34.0
author
#1 lore raw

PATCH v2 2/2 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

---
 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/image.bbclass +1 -1
index 6c759fdf700..68f8ecfa962 100644
@@ -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)}'
Signature · 1 line
2.34.0