From 53b3781a5962e1f2a89243201549798641fd32c4 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 25 Apr 2024 16:51:30 +0100 Subject: [PATCH] arm-bsp/corstone1000-recovery-image: replace core-image-minimal Add corstone1000-recovery-image image based on core-image-minimal while disabling the testimage task which is irrelevant in case of an initramfs bundle. Signed-off-by: Abdellatif El Khlifi Signed-off-by: Bence Balogh Signed-off-by: Ross Burton --- kas/corstone1000-image-configuration.yml | 4 ++-- .../recipes-bsp/images/corstone1000-recovery-image.bb | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/images/corstone1000-recovery-image.bb diff --git a/kas/corstone1000-image-configuration.yml b/kas/corstone1000-image-configuration.yml index 4fa5931d..a3ed6f4f 100644 --- a/kas/corstone1000-image-configuration.yml +++ b/kas/corstone1000-image-configuration.yml @@ -15,8 +15,8 @@ local_conf_header: initramfsetup: | # Telling the build system which image is responsible of the generation of the initramfs rootfs INITRAMFS_IMAGE_BUNDLE:firmware = "1" - INITRAMFS_IMAGE:firmware ?= "core-image-minimal" - IMAGE_FSTYPES:firmware:pn-core-image-minimal = "${INITRAMFS_FSTYPES}" + INITRAMFS_IMAGE:firmware ?= "corstone1000-recovery-image" + IMAGE_FSTYPES:firmware:pn-corstone1000-recovery-image = "${INITRAMFS_FSTYPES}" IMAGE_NAME_SUFFIX:firmware = "" # enable mdev/busybox for init diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-recovery-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-recovery-image.bb new file mode 100644 index 00000000..5ee9adfb --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-recovery-image.bb @@ -0,0 +1,7 @@ +require recipes-core/images/core-image-minimal.bb + +# The core-image-minimal is used for the initramfs bundle for the +# Corstone1000 but the testimage task caused hanging errors. This is +# why the core-image-minimal is forked here so the testimage task can +# be disabled as it is not relevant for the Corstone1000. +IMAGE_CLASSES:remove = "testimage"