aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-07 11:16:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-07 23:10:22 +0000
commit4436c92d9a204f202e0a4f7813250acec17fa72e (patch)
tree7cfb0df7eb690b2543261b1d4523ddd11137b3ee
parentf30ebc0b82b10f56f250a3a9c4f1f2fe9fb281b3 (diff)
downloadopenembedded-core-contrib-4436c92d9a204f202e0a4f7813250acec17fa72e.tar.gz
openembedded-core-contrib-4436c92d9a204f202e0a4f7813250acec17fa72e.tar.bz2
openembedded-core-contrib-4436c92d9a204f202e0a4f7813250acec17fa72e.zip
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.
-rw-r--r--meta/classes/qemu.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 333202b7c4..01a7b86ae1 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"