[OE-core][PATCH] qemuboot.bbclass: make sure runqemu boots bundled initramfs kernel image

[OE-core][PATCH] qemuboot.bbclass: make sure runqemu boots bundled initramfs kernel image

[Jagadeesh Krishnanjanappa]

The QB_DEFAULT_KERNEL is set to pick bundled initramfs kernel image
if the Linux kernel image is generated with INITRAMFS_IMAGE_BUNDLE="1".

This makes runqemu to automatically pick bundled initramfs kernel image
instead of explicitly mentioning bundled initramfs kernel image in
runqemu.

[YOCTO #14748]

Signed-off-by: Jagadeesh Krishnanjanappa <workjagadeesh@gmail.com>
---
 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 018c000ca20..5a0e50ccfc2 100644
--- a/meta/classes-recipe/qemuboot.bbclass
+++ b/meta/classes-recipe/qemuboot.bbclass
@@ -13,6 +13,7 @@
 # QB_OPT_APPEND: options to append to qemu, e.g., "-device usb-mouse"
 #
 # QB_DEFAULT_KERNEL: default kernel to boot, e.g., "bzImage"
+#                                            e.g., "bzImage-initramfs-qemux86-64.bin" if INITRAMFS_IMAGE_BUNDLE is set to 1.
 #
 # QB_DEFAULT_FSTYPE: default FSTYPE to boot, e.g., "ext4"
 #
@@ -93,7 +94,7 @@
 QB_MEM ?= "-m 256"
 QB_SMP ?= ""
 QB_SERIAL_OPT ?= "-serial mon:stdio -serial null"
-QB_DEFAULT_KERNEL ?= "${KERNEL_IMAGETYPE}"
+QB_DEFAULT_KERNEL ?= "${@bb.utils.contains("INITRAMFS_IMAGE_BUNDLE", "1", "${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin", "${KERNEL_IMAGETYPE}", d)}"
 QB_DEFAULT_FSTYPE ?= "ext4"
 QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
 QB_OPT_APPEND ?= ""
-- 
2.17.1

Re: [OE-core][PATCH] qemuboot.bbclass: make sure runqemu boots bundled initramfs kernel image

[Jagadeesh Krishnanjanappa]

[-- Attachment #1: Type: text/plain, Size: 1668 bytes --]

ping.

On Tue, Dec 13, 2022 at 8:28 PM Jagadeesh Krishnanjanappa <
workjagadeesh@gmail.com> wrote:

> The QB_DEFAULT_KERNEL is set to pick bundled initramfs kernel image
> if the Linux kernel image is generated with INITRAMFS_IMAGE_BUNDLE="1".
>
> This makes runqemu to automatically pick bundled initramfs kernel image
> instead of explicitly mentioning bundled initramfs kernel image in
> runqemu.
>
> [YOCTO #14748]
>
> Signed-off-by: Jagadeesh Krishnanjanappa <workjagadeesh@gmail.com>
> ---
>  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 018c000ca20..5a0e50ccfc2 100644
> --- a/meta/classes-recipe/qemuboot.bbclass
> +++ b/meta/classes-recipe/qemuboot.bbclass
> @@ -13,6 +13,7 @@
>  # QB_OPT_APPEND: options to append to qemu, e.g., "-device usb-mouse"
>  #
>  # QB_DEFAULT_KERNEL: default kernel to boot, e.g., "bzImage"
> +#                                            e.g.,
> "bzImage-initramfs-qemux86-64.bin" if INITRAMFS_IMAGE_BUNDLE is set to 1.
>  #
>  # QB_DEFAULT_FSTYPE: default FSTYPE to boot, e.g., "ext4"
>  #
> @@ -93,7 +94,7 @@
>  QB_MEM ?= "-m 256"
>  QB_SMP ?= ""
>  QB_SERIAL_OPT ?= "-serial mon:stdio -serial null"
> -QB_DEFAULT_KERNEL ?= "${KERNEL_IMAGETYPE}"
> +QB_DEFAULT_KERNEL ?= "${@bb.utils.contains("INITRAMFS_IMAGE_BUNDLE", "1",
> "${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin", "${KERNEL_IMAGETYPE}",
> d)}"
>  QB_DEFAULT_FSTYPE ?= "ext4"
>  QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device
> virtio-rng-pci,rng=rng0"
>  QB_OPT_APPEND ?= ""
> --
> 2.17.1
>
>

[-- Attachment #2: Type: text/html, Size: 2331 bytes --]