diff mbox series

[v4,3/8] qemux86: drop duplicates with qemu.inc

Message ID 20250618094550.1335521-3-dmitry.baryshkov@oss.qualcomm.com
State New
Headers show
Series [v4,1/8] mesa: fix RPROVIDEd package names | expand

Commit Message

Dmitry Baryshkov June 18, 2025, 9:45 a.m. UTC
qemu.inc already includes PREFERRED_PROVIDER values for xserver and GL
libraries. Drop the same values being set in the machine config.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 meta/conf/machine/qemux86.conf | 6 ------
 1 file changed, 6 deletions(-)

Comments

Peter Kjellerstedt June 18, 2025, 12:52 p.m. UTC | #1
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Dmitry Baryshkov via lists.openembedded.org
> Sent: den 18 juni 2025 11:46
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH v4 3/8] qemux86: drop duplicates with qemu.inc
> 
> qemu.inc already includes PREFERRED_PROVIDER values for xserver and GL
> libraries. Drop the same values being set in the machine config.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

The subject and commit message for this and the next commit should be 
updated to reflect that the duplicates are in default-providers.inc 
rather than qemu.inc.

//Peter

> ---
>  meta/conf/machine/qemux86.conf | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
> index 1e072e1ae285..51f080bd2a51 100644
> --- a/meta/conf/machine/qemux86.conf
> +++ b/meta/conf/machine/qemux86.conf
> @@ -2,12 +2,6 @@
>  #@NAME: QEMU x86 machine
>  #@DESCRIPTION: Machine configuration for running an x86 system on QEMU
> 
> -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> -PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
> -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
> -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
> -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa"
> -
>  require conf/machine/include/qemu.inc
>  DEFAULTTUNE ?= "core2-32"
>  require conf/machine/include/x86/tune-corei7.inc
> --
> 2.39.5
Dmitry Baryshkov June 18, 2025, 1:02 p.m. UTC | #2
On Wed, 18 Jun 2025 at 15:52, Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Dmitry Baryshkov via lists.openembedded.org
> > Sent: den 18 juni 2025 11:46
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core] [PATCH v4 3/8] qemux86: drop duplicates with qemu.inc
> >
> > qemu.inc already includes PREFERRED_PROVIDER values for xserver and GL
> > libraries. Drop the same values being set in the machine config.
> >
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
>
> The subject and commit message for this and the next commit should be
> updated to reflect that the duplicates are in default-providers.inc
> rather than qemu.inc.

When this patch is being applied, the duplicates are present in both
places. But I see your logic, let me send an update.

>
> //Peter
>
> > ---
> >  meta/conf/machine/qemux86.conf | 6 ------
> >  1 file changed, 6 deletions(-)
> >
> > diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
> > index 1e072e1ae285..51f080bd2a51 100644
> > --- a/meta/conf/machine/qemux86.conf
> > +++ b/meta/conf/machine/qemux86.conf
> > @@ -2,12 +2,6 @@
> >  #@NAME: QEMU x86 machine
> >  #@DESCRIPTION: Machine configuration for running an x86 system on QEMU
> >
> > -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> > -PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
> > -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
> > -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
> > -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa"
> > -
> >  require conf/machine/include/qemu.inc
> >  DEFAULTTUNE ?= "core2-32"
> >  require conf/machine/include/x86/tune-corei7.inc
> > --
> > 2.39.5
>
diff mbox series

Patch

diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 1e072e1ae285..51f080bd2a51 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -2,12 +2,6 @@ 
 #@NAME: QEMU x86 machine
 #@DESCRIPTION: Machine configuration for running an x86 system on QEMU
 
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa"
-
 require conf/machine/include/qemu.inc
 DEFAULTTUNE ?= "core2-32"
 require conf/machine/include/x86/tune-corei7.inc