[OE-core] [PATCH 02/12] qemu: enable virglrenderer and glx options for native/nativesdk builds

[Joshua Watt]

On Mon, 2019-02-25 at 13:52 +0100, Alexander Kanavin wrote:
> On Mon, 25 Feb 2019 at 12:02, Richard Purdie
> <richard.purdie at linuxfoundation.org> wrote:
> > On Fri, 2019-02-22 at 15:33 +0100, Alexander Kanavin wrote:
> > > Except for ming32/darwin, which do not support them.
> > > 
> > > Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
> > > ---
> > >  meta/recipes-devtools/qemu/qemu.inc | 10 +++++-----
> > >  1 file changed, 5 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-
> > > devtools/qemu/qemu.inc
> > > index c127434b020..95e9e0ede77 100644
> > > --- a/meta/recipes-devtools/qemu/qemu.inc
> > > +++ b/meta/recipes-devtools/qemu/qemu.inc
> > > @@ -74,15 +74,15 @@ PACKAGECONFIG ??= " \
> > >      fdt sdl kvm \
> > >      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
> > >  "
> > > -PACKAGECONFIG_class-native ??= "fdt alsa kvm"
> > > -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm"
> > > +PACKAGECONFIG_class-native ??= "fdt alsa kvm virglrenderer glx"
> > > +PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer
> > > glx"
> > > 
> > >  # Handle distros such as CentOS 5 32-bit that do not have kvm
> > > support
> > >  PACKAGECONFIG_class-native_remove = "${@'kvm' if not
> > > os.path.exists('/usr/include/linux/kvm.h') else ''}"
> > > 
> > > -# Disable kvm on targets that do not support it
> > > -PACKAGECONFIG_remove_darwin = "kvm"
> > > -PACKAGECONFIG_remove_mingw32 = "kvm"
> > > +# Disable kvm/virgl/mesa on targets that do not support it
> > > +PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+"
> > > +PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+"
> > 
> > Sorry, I just spotted this. Please don't use _remove in OE-Core.
> > Can we
> > rearrange this so we don't need to use remove?
> > 
> > I appreciate there are other users that have crept in but I'd like
> > to
> > see them gone too...
> 
> I'm actually unsure how to override the
> PACKAGECONFIG_append_pn-qemu-native = " gtk+"
> set in local.conf without using _remove.

I don't think I quite follow why this is an issue, mingw is not a
supported build host AFAIK, so the "-native" means it shouldn't be a
problem (e.g. "native" should never mean "mingw")? Not sure about
darwin though.

> 
> (we do not support gtk+ on mingw, and I guess darwin too).
> 
> We can rearrange this, enable/not enable gtk+ directly in the recipe,
> and drop the qemu related lines from local.conf altogether, if you're
> okay with that.
> 
> Alex
-- 
Joshua Watt <JPEWhacker at gmail.com>