From c9b6941f3db411514e248b594d6bd87c66765330 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Thu, 16 Jul 2020 14:37:30 +0100 Subject: [PATCH] arm-autonomy/qemu: Install qemu-system-i386 instead of qemu-xen This patch cleans the qemu_%.bbappend and uses the already provided qemu-system-i386 package from meta-virtualization to include only the /usr/bin/qemu-system-i386 binary. Change-Id: I6f1fc4db458d0b09c54013c1512398521cb349e2 Issue-Id: SCM-889 Signed-off-by: Diego Sueiro Reviewed-by: Bertrand Marquis Signed-off-by: Jon Mason --- .../images/arm-autonomy-host-image-minimal.bb | 2 +- .../recipes-devtools/qemu/qemu_%.bbappend | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb b/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb index 5b20fa09..9731c7c8 100644 --- a/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb +++ b/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb @@ -39,7 +39,7 @@ ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS ??= "" IMAGE_INSTALL += " \ packagegroup-core-boot \ packagegroup-core-ssh-openssh \ - qemu-xen \ + qemu-system-i386 \ xenguest-manager \ xenguest-network-bridge \ " diff --git a/meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend b/meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend index ed63a4e9..dbd89aad 100644 --- a/meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend +++ b/meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend @@ -6,13 +6,7 @@ OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d QEMU_TARGETS_xen = "i386" PACKAGECONFIG[noaudio] = "--audio-drv-list='',," -PACKAGECONFIG_append_xen = " virtfs noaudio" -PACKAGECONFIG_remove_xen = "sdl" +PACKAGECONFIG_append_xen = " noaudio" +PACKAGECONFIG_remove_xen = "fdt sdl kvm" -# Reduce the qemu package size by splitting it into -# qemu and qemu-xen packages -PACKAGES_prepend_xen := "${PN}-xen" -RDEPENDS_${PN}_xen += "${PN}-xen" -FILES_${PN}-xen_xen = "${bindir}/qemu-system-i386" -RDEPENDS_${PN}-xen_xen += "xen-tools-libxenstore xen-tools-libxenctrl \ - xen-tools-libxenguest" +require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'recipes-devtools/qemu/${BPN}-package-split.inc', '', d)}