diff mbox series

[05/20] kernel.bbclass: stage the sysroot-only folder

Message ID 20250504130507.717954-5-adrian.freihofer@siemens.com
State New
Headers show
Series [01/20] oe-selftest: add new ext dtb recipe | expand

Commit Message

Freihofer, Adrian May 4, 2025, 1:04 p.m. UTC
From: Adrian Freihofer <adrian.freihofer@siemens.com>

Move the configuration for staging the sysroot-only directory from the
kernel-fitimage.bbclass to the kernel.bbclass. This is a preparation for
using the FIT image related artifacts also from an independent recipe
which creates the FIT image from artifacts going via sstate-cache.

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
---
 meta/classes-recipe/kernel-fitimage.bbclass | 1 -
 meta/classes-recipe/kernel.bbclass          | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass
index 07786647e19..765776a562b 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -731,7 +731,6 @@  do_assemble_fitimage() {
 
 addtask assemble_fitimage before do_install after do_compile
 
-SYSROOT_DIRS:append = " /sysroot-only"
 do_install:append() {
 	if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage" && \
 		[ "${UBOOT_SIGN_ENABLE}" = "1" ]; then
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
index 36ce659762e..1a7a60eadfc 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -631,8 +631,8 @@  do_shared_workdir () {
 
 }
 
-# We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware
-SYSROOT_DIRS = ""
+# Stage the sysroot-only folder e.g. for FIT image related artifacts
+SYSROOT_DIRS = "/sysroot-only"
 
 KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} olddefconfig || oe_runmake -C ${S} O=${B} oldnoconfig"