diff options
author | Jagadeesh Krishnanjanappa <workjagadeesh@gmail.com> | 2022-12-13 14:58:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-06 17:33:15 +0000 |
commit | 99d085ecc374afd1fc2c017e91d4746d06ed4c23 (patch) | |
tree | 01e033adfdd131705e6c721f7b2b279517049f2f | |
parent | 4c5d832fe97af9940a43587ecba97b98c6e68bb9 (diff) | |
download | poky-99d085ecc374afd1fc2c017e91d4746d06ed4c23.tar.gz |
qemuboot.bbclass: make sure runqemu boots bundled initramfs kernel image
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]
(From OE-Core rev: 0c63018ef3843cfefd2be31c0a6693181037410d)
Signed-off-by: Jagadeesh Krishnanjanappa <workjagadeesh@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 52371624313184e1a825519160c3833e282df8b9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/qemuboot.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 648af09b6e..92ae69d9f2 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass | |||
@@ -7,6 +7,7 @@ | |||
7 | # QB_OPT_APPEND: options to append to qemu, e.g., "-show-cursor" | 7 | # QB_OPT_APPEND: options to append to qemu, e.g., "-show-cursor" |
8 | # | 8 | # |
9 | # QB_DEFAULT_KERNEL: default kernel to boot, e.g., "bzImage" | 9 | # QB_DEFAULT_KERNEL: default kernel to boot, e.g., "bzImage" |
10 | # e.g., "bzImage-initramfs-qemux86-64.bin" if INITRAMFS_IMAGE_BUNDLE is set to 1. | ||
10 | # | 11 | # |
11 | # QB_DEFAULT_FSTYPE: default FSTYPE to boot, e.g., "ext4" | 12 | # QB_DEFAULT_FSTYPE: default FSTYPE to boot, e.g., "ext4" |
12 | # | 13 | # |
@@ -75,7 +76,7 @@ | |||
75 | 76 | ||
76 | QB_MEM ?= "-m 256" | 77 | QB_MEM ?= "-m 256" |
77 | QB_SERIAL_OPT ?= "-serial mon:stdio -serial null" | 78 | QB_SERIAL_OPT ?= "-serial mon:stdio -serial null" |
78 | QB_DEFAULT_KERNEL ?= "${KERNEL_IMAGETYPE}" | 79 | QB_DEFAULT_KERNEL ?= "${@bb.utils.contains("INITRAMFS_IMAGE_BUNDLE", "1", "${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin", "${KERNEL_IMAGETYPE}", d)}" |
79 | QB_DEFAULT_FSTYPE ?= "ext4" | 80 | QB_DEFAULT_FSTYPE ?= "ext4" |
80 | QB_OPT_APPEND ?= "-show-cursor" | 81 | QB_OPT_APPEND ?= "-show-cursor" |
81 | QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" | 82 | QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" |