diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-07 11:16:57 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-07 23:10:26 +0000 |
| commit | 8a8622d3e167cfcc79e64c7a6c1467da6195c391 (patch) | |
| tree | 5c2006460ed6e8496b2516d122fec14d6b23cada | |
| parent | 4bb526f09ee5787344fdc982e846775317ecf8f2 (diff) | |
| download | poky-8a8622d3e167cfcc79e64c7a6c1467da6195c391.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/qemu.bbclass | 2 |
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): | |||
| 54 | # this dance). For others (e.g. arm) a -cpu option is not necessary, since the | 54 | # this dance). For others (e.g. arm) a -cpu option is not necessary, since the |
| 55 | # qemu-arm default CPU supports all required architecture levels. | 55 | # qemu-arm default CPU supports all required architecture levels. |
| 56 | 56 | ||
| 57 | QEMU_OPTIONS = "${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')) or ""}" | 57 | QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')) or ""}" |
| 58 | QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}" | 58 | QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}" |
| 59 | 59 | ||
| 60 | QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2" | 60 | QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2" |