The Spectre and Meltdown mitigations for Xen run PV guests within HVM virtual machines, so Qemu is no longer only needed for systems configured to run HVM guests.
With the split xen hypervisor and tools recipes, the bios dependencies belong in the tools recipe, so move them and replace the hvm PACKAGECONFIG option with the recommendation based on target arch. Signed-off-by: Christopher Clark <[email protected]> --- Unchanged since v1 recipes-extended/xen/xen-tools.inc | 9 ++------- recipes-extended/xen/xen.inc | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc index 6bbc8cd..54bc477 100644 --- a/recipes-extended/xen/xen-tools.inc +++ b/recipes-extended/xen/xen-tools.inc @@ -30,14 +30,9 @@ RDEPENDS:${PN} = "\ RDEPENDS:${PN}-dev = "" -# Qemu is necessary on ARM platforms, and to support HVM guests on x86 -QEMU = "${@bb.utils.contains('PACKAGECONFIG', 'hvm', 'qemu', '', d)}" -QEMU:arm = "qemu" -QEMU:aarch64 = "qemu" - RRECOMMENDS:${PN} = " \ - ${QEMU} \ - ${@bb.utils.contains('PACKAGECONFIG', 'hvm', 'seabios', '', d)} \ + qemu \ + ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', 'seabios ipxe vgabios', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'externalblktap', '', '${BLKTAP_RRECOMMENDS}', d)} \ ${PN}-flask \ ${PN}-hvmloader \ diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index 8b86de5..4c38ccf 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -9,13 +9,11 @@ require xen-arch.inc PACKAGECONFIG ??= " \ sdl \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', 'hvm', '', d)} \ " PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl," PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native," PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd," -PACKAGECONFIG[hvm] = "--with-system-seabios="/usr/share/firmware/bios.bin",--disable-seabios,seabios ipxe vgabios," PACKAGECONFIG[externalblktap] = ",,," DEPENDS = " \ @@ -132,7 +130,9 @@ EXTRA_OECONF += " \ --disable-rombios \ --disable-ocamltools \ --disable-qemu-traditional \ - ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', '--enable-pvshim', '--disable-pvshim', d)} \ + ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', \ + '--enable-pvshim --with-system-seabios="/usr/share/firmware/bios.bin"', \ + '--disable-pvshim --disable-seabios', d)} \ " EXTRA_OEMAKE += "STDVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.7a.bin" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7226): https://lists.yoctoproject.org/g/meta-virtualization/message/7226 Mute This Topic: https://lists.yoctoproject.org/mt/90743682/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
