Skip to contentSkip to conversation

Revert "qemu.bbclass: drop OLDEST_KERNEL reference"

PATCH New Richard Purdie 1 participant 1 message Jan 7, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "qemu.bbclass: drop OLDEST_KERNEL reference"

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(-)
meta/classes/qemu.bbclass +1 -1
index 333202b7c47..01a7b86ae1a 100644
@@ -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"
Signature · 1 line
2.32.0