mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 09:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

baremetal-image: Avoid overriding qemu variables from IMAGE_CLASSES

Browse Source 
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: 8ed78ec262b2502dc3b673b24a868a3eec616a20)

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alejandro Hernandez Samaniego
2022-12-08 11:43:47 -07:00
committed by Richard Purdie
parent 6de3b16cad
commit 0cde767afc
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/classes-recipe/baremetal-image.bbclass
View File

@@ -15,15 +15,6 @@
# #
# See meta-skeleton for a working example. # See meta-skeleton for a working example.
## 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] += ""
# Toolchain should be baremetal or newlib based. # Toolchain should be baremetal or newlib based.
# TCLIBC="baremetal" or TCLIBC="newlib" # TCLIBC="baremetal" or TCLIBC="newlib"
@@ -110,6 +101,17 @@ QB_OPT_APPEND:append:qemuriscv32 = " -bios none"
CFLAGS:append:qemuriscv64 = " -mcmodel=medany" 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 # This next part is necessary to trick the build system into thinking
# its building an image recipe so it generates the qemuboot.conf # its building an image recipe so it generates the qemuboot.conf
addtask do_rootfs before do_image after do_install addtask do_rootfs before do_image after do_install