From dc189cf536bc3f0898234eab5e0af678cb58c987 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Samaniego Date: Thu, 8 Dec 2022 11:43:47 -0700 Subject: [PATCH] baremetal-image: Avoid overriding qemu variables from IMAGE_CLASSES Since qemuboot is part of IMAGE_CLASSES via qemu.inc it is being inherited before we set the QB_FOO variables. Since our variables have conditional definitions and at that point they've already been defined by qemuboot, we can no longer define them in our class. Move the IMAGE_CLASSES inherit to execute it after we set the QB_FOO variables to fix booting via runqemu. (From OE-Core rev: c588b05ed4bc6b46749e24e80300228df017c694) Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Alexandre Belloni (cherry picked from commit 8ed78ec262b2502dc3b673b24a868a3eec616a20) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes/baremetal-image.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/baremetal-image.bbclass b/meta/classes/baremetal-image.bbclass index cb9e250350..3a96df1f2d 100644 --- a/meta/classes/baremetal-image.bbclass +++ b/meta/classes/baremetal-image.bbclass @@ -95,6 +95,17 @@ QB_OPT_APPEND:append:qemuriscv32 = " -bios none" CFLAGS:append:qemuriscv64 = " -mcmodel=medany" +## Emulate image.bbclass +# Handle inherits of any of the image classes we need +IMAGE_CLASSES ??= "" +IMGCLASSES = " ${IMAGE_CLASSES}" +inherit ${IMGCLASSES} +# Set defaults to satisfy IMAGE_FEATURES check +IMAGE_FEATURES ?= "" +IMAGE_FEATURES[type] = "list" +IMAGE_FEATURES[validitems] += "" + + # This next part is necessary to trick the build system into thinking # its building an image recipe so it generates the qemuboot.conf addtask do_rootfs before do_image after do_install