diff mbox series

Revert "qemu.bbclass: drop OLDEST_KERNEL reference"

Message ID 20220107111753.1500432-1-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit 4436c92d9a204f202e0a4f7813250acec17fa72e
Headers show
Series Revert "qemu.bbclass: drop OLDEST_KERNEL reference" | expand

Commit Message

Richard Purdie Jan. 7, 2022, 11:17 a.m. UTC 
This patch was merged on the basis that it wasn't needed with recent versions
of qemu. That isn't true and has been showen to cause failures for aarch64 on
centos7 hosts. Revert the patch as we'll need a different solution.

This reverts commit 94b371e1c9e3cea787d70d6d7a09f7d3d69a30aa.
---
 meta/classes/qemu.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 333202b7c47..01a7b86ae1a 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -54,7 +54,7 @@  def qemu_run_binary(data, rootfs_path, binary):
 # this dance). For others (e.g. arm) a -cpu option is not necessary, since the
 # qemu-arm default CPU supports all required architecture levels.
 
-QEMU_OPTIONS = "${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')) or ""}"
+QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')) or ""}"
 QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}"
 
 QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2"