Message ID | 20250618140526.1431757-2-dmitry.baryshkov@oss.qualcomm.com |
---|---|
State | New |
Headers | show |
Series | [v5,1/8] mesa: fix RPROVIDEd package names | expand |
On Wed Jun 18, 2025 at 4:05 PM CEST, Dmitry Baryshkov via lists.openembedded.org wrote: > The virtual-{libegl,libglx}-icd names are RPROVIDES, not PROVIDES, > because they are a runtime dependency of libglvnd. Make > default-providers follow that and specify PREFERRED_RPROVIDER instead of > PREFERRED_PROVIDER for those names. > > Fixes: 9d3b4c9bc403 ("mesa: sort out PROVIDES for the glvnd case") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> > --- Hi Dmitry, Thanks for the new version. I got the following error on the autobuilder: 2025-06-18 15:00:07,705 - oe-selftest - INFO - distrodata.Distrodata.test_maintainers (subunit.RemotedTestCase) 2025-06-18 15:00:07,706 - oe-selftest - INFO - ... FAIL ... AssertionError: Unable to find recipes for the following entries in maintainers.inc: libglvnd https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/1795
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 4f094163546c..274ad0c4f630 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -7,9 +7,7 @@ PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/libsdl2 ?= "libsdl2" PREFERRED_PROVIDER_virtual/libsdl2-native ?= "libsdl2-native" PREFERRED_PROVIDER_virtual/egl ?= "mesa" -PREFERRED_PROVIDER_virtual/libegl-icd ?= "mesa" PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libglx-icd ?= "mesa" PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native" PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa" PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" @@ -68,4 +66,6 @@ PREFERRED_RPROVIDER_initd-functions ?= "initscripts" PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa" PREFERRED_PROVIDER_virtual/nativesdk-libsdl2 ?= "nativesdk-libsdl2" +PREFERRED_RPROVIDER_virtual-libegl-icd ?= "mesa" +PREFERRED_RPROVIDER_virtual-libglx-icd ?= "mesa" PREFERRED_RPROVIDER_virtual-x-terminal-emulator ?= "rxvt-unicode"
The virtual-{libegl,libglx}-icd names are RPROVIDES, not PROVIDES, because they are a runtime dependency of libglvnd. Make default-providers follow that and specify PREFERRED_RPROVIDER instead of PREFERRED_PROVIDER for those names. Fixes: 9d3b4c9bc403 ("mesa: sort out PROVIDES for the glvnd case") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> --- meta/conf/distro/include/default-providers.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)