From: Markus Volk <f_l_k@t-online.de>
Date: Sat, 12 Mar 2022 08:01:58 +0000 (+0100)
Subject: x86-base.inc: replace intel i965 driver with crocus
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=63f10412d793c6c10290838eb230f179046f1d23;p=openembedded-core.git

x86-base.inc: replace intel i965 driver with crocus

this fixes do_rootfs for core-image-sato after mesa update:

 Problem: package packagegroup-core-x11-base-1.0-r1.noarch requires packagegroup-core-x11-xserver, but none of the providers can be installed
  - conflicting requests
  - nothing provides mesa-driver-i965 needed by packagegroup-core-x11-xserver-1.0-r40.intel_corei7_64
(try to add '--skip-broken' to skip uninstallable packages)

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc
index e76251ea2b..b70924f7d9 100644
--- a/meta/conf/machine/include/x86/x86-base.inc
+++ b/meta/conf/machine/include/x86/x86-base.inc
@@ -36,7 +36,7 @@ XSERVER_X86_I915 = "xf86-video-intel \
            "
 
 XSERVER_X86_I965 = "xf86-video-intel \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-crocus', '', d)} \
            "
 
 XSERVER_X86_VESA = "xf86-video-vesa"