From 2d07b2b7342cb663a03a3d6976570ca26af651b5 Mon Sep 17 00:00:00 2001 From: "Weisser, Pascal.ext" Date: Wed, 3 Jul 2024 12:56:03 +0200 Subject: [PATCH] qemuboot: Trigger write_qemuboot_conf task on changes of kernel image realpath The qemuboot.conf file contains the realpath of the kernel image referenced by QB_DEFAULT_KERNEL. So, it must be recreated in case the realpath of the referenced kernel image changes. The variables KERNEL_IMAGE_NAME and KERNEL_IMAGE_BIN_EXT determine the realpath of the kernel image relative to DEPLOY_DIR_IMAGE. Adding both of them to the vardeps of the write_qemuboot_conf task triggers the write_qemuboot_conf task in case the realpath of the kernel image referenced by QB_DEFAULT_KERNEL changes. Fixes: [YOCTO 15525] (From OE-Core rev: fd21b5fa159e4c612475152e998ae85526fd60d9) Signed-off-by: "Weisser, Pascal" Signed-off-by: Richard Purdie (cherry picked from commit f8b3975a9ce36ea7af5fd76243a823da2842415b) Signed-off-by: Steve Sakoman --- meta/classes-recipe/qemuboot.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/qemuboot.bbclass b/meta/classes-recipe/qemuboot.bbclass index 895fd38d68..0f80c60ab5 100644 --- a/meta/classes-recipe/qemuboot.bbclass +++ b/meta/classes-recipe/qemuboot.bbclass @@ -129,7 +129,8 @@ addtask do_write_qemuboot_conf after do_rootfs before do_image def qemuboot_vars(d): build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE', - 'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME', + 'KERNEL_IMAGETYPE', 'KERNEL_IMAGE_NAME', + 'KERNEL_IMAGE_BIN_EXT', 'IMAGE_NAME', 'IMAGE_LINK_NAME', 'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE', 'STAGING_DIR_HOST', 'SERIAL_CONSOLES', 'UNINATIVE_LOADER'] return build_vars + [k for k in d.keys() if k.startswith('QB_')]