[meta-arm] arm-autonomy/qemu: Install qemu-system-i386 instead of qemu-xen

Submitted by Diego Sueiro on July 16, 2020, 1:37 p.m. | Patch ID: 174484

Details

Message ID 1594906650-4962-1-git-send-email-diego.sueiro@arm.com
State New
Headers show

Commit Message

Diego Sueiro July 16, 2020, 1:37 p.m.
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 <diego.sueiro@arm.com>
---
 .../recipes-core/images/arm-autonomy-host-image-minimal.bb   |  2 +-
 meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend      | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

Patch hide | download patch | download mbox

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 5b20fa0..9731c7c 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 ed63a4e..dbd89aa 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)}

Comments

Bertrand Marquis July 16, 2020, 1:57 p.m.
> On 16 Jul 2020, at 15:37, Diego Sueiro via lists.yoctoproject.org <diego.sueiro=arm.com@lists.yoctoproject.org> wrote:
> 
> 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 <diego.sueiro@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

> ---
> .../recipes-core/images/arm-autonomy-host-image-minimal.bb   |  2 +-
> meta-arm-autonomy/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 5b20fa0..9731c7c 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 ed63a4e..dbd89aa 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)}
> -- 
> 2.7.4
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#862): https://lists.yoctoproject.org/g/meta-arm/message/862
Mute This Topic: https://lists.yoctoproject.org/mt/75541540/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason July 17, 2020, 1:14 p.m.
On Thu, Jul 16, 2020 at 01:57:08PM +0000, Bertrand Marquis wrote:
> 
> 
> > On 16 Jul 2020, at 15:37, Diego Sueiro via lists.yoctoproject.org <diego.sueiro=arm.com@lists.yoctoproject.org> wrote:
> > 
> > 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 <diego.sueiro@arm.com>
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Applied to master.

Thanks,
Jon

> 
> > ---
> > .../recipes-core/images/arm-autonomy-host-image-minimal.bb   |  2 +-
> > meta-arm-autonomy/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 5b20fa0..9731c7c 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 ed63a4e..dbd89aa 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)}
> > -- 
> > 2.7.4
> > 
> > 
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#873): https://lists.yoctoproject.org/g/meta-arm/message/873
Mute This Topic: https://lists.yoctoproject.org/mt/75541540/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-