| Message ID | 20250618212055.1529969-2-dmitry.baryshkov@oss.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v6,1/8] default-providers: fix GLVND providers to be selected at runtime | expand |
On Wed Jun 18, 2025 at 11:20 PM CEST, Dmitry Baryshkov via lists.openembedded.org wrote: > default-providers.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/include/qemu.inc | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc > index d7392d476238..c143e37f710e 100644 > --- a/meta/conf/machine/include/qemu.inc > +++ b/meta/conf/machine/include/qemu.inc > @@ -1,10 +1,3 @@ > -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" > -PREFERRED_PROVIDER_virtual/egl ?= "mesa" > -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" > -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" > -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" > -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" > - > XSERVER ?= "xserver-xorg \ > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ > xf86-video-fbdev \ This conflicts with your previous patch ("qemu.inc: handle GLVND-related providers"). Should this one be refreshed to: diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 4fa18812db..c143e37f71 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -1,10 +1,3 @@ -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" -PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" -PREFERRED_PROVIDER_virtual/libgles1 ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" -PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" -PREFERRED_PROVIDER_virtual/libgles3 ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" - XSERVER ?= "xserver-xorg \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ xf86-video-fbdev \ or should the first one be dropped? Dropping the first one for testing for now. Antonin
On Thu, 19 Jun 2025 at 10:53, Antonin Godard <antonin.godard@bootlin.com> wrote: > > On Wed Jun 18, 2025 at 11:20 PM CEST, Dmitry Baryshkov via lists.openembedded.org wrote: > > default-providers.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/include/qemu.inc | 7 ------- > > 1 file changed, 7 deletions(-) > > > > diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc > > index d7392d476238..c143e37f710e 100644 > > --- a/meta/conf/machine/include/qemu.inc > > +++ b/meta/conf/machine/include/qemu.inc > > @@ -1,10 +1,3 @@ > > -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" > > -PREFERRED_PROVIDER_virtual/egl ?= "mesa" > > -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" > > -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" > > -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" > > -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" > > - > > XSERVER ?= "xserver-xorg \ > > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ > > xf86-video-fbdev \ > > This conflicts with your previous patch ("qemu.inc: handle GLVND-related > providers"). Should this one be refreshed to: > > diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc > index 4fa18812db..c143e37f71 100644 > --- a/meta/conf/machine/include/qemu.inc > +++ b/meta/conf/machine/include/qemu.inc > @@ -1,10 +1,3 @@ > -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" > -PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" > -PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" > -PREFERRED_PROVIDER_virtual/libgles1 ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" > -PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" > -PREFERRED_PROVIDER_virtual/libgles3 ?= "${@bb.utils.contains('DISTRO_FEATURES','glvnd','libglvnd','mesa',d)}" > - > XSERVER ?= "xserver-xorg \ > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ > xf86-video-fbdev \ > > or should the first one be dropped? The first one should be dropped. > > Dropping the first one for testing for now. > > Antonin > > -- > Antonin Godard, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com >
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index d7392d476238..c143e37f710e 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -1,10 +1,3 @@ -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/egl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" - XSERVER ?= "xserver-xorg \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ xf86-video-fbdev \
default-providers.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/include/qemu.inc | 7 ------- 1 file changed, 7 deletions(-)