@@ -6,11 +6,15 @@ 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)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \
xf86-video-fbdev \
xf86-video-modesetting \
"
+XSERVER_RECOMMENDS ?= " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
+ "
+
MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
MACHINEOVERRIDES =. "qemuall:"
@@ -23,7 +23,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
# This is because gallium swrast driver was found to crash X server on startup in qemu x32.
XSERVER = "xserver-xorg \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
- bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'mesa-driver-swrast xserver-xorg-extension-glx', d), '', d)} \
+ bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'xserver-xorg-extension-glx', d), '', d)} \
xf86-video-cirrus \
xf86-video-fbdev \
xf86-video-vmware \
@@ -32,6 +32,11 @@ XSERVER = "xserver-xorg \
xserver-xorg-module-libint10 \
"
+XSERVER_RECOMMENDS = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
+ bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'mesa-driver-swrast', d), '', d)} \
+ "
+
MACHINE_FEATURES += "x86 pci"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
@@ -20,7 +20,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
XSERVER = "xserver-xorg \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \
xf86-video-cirrus \
xf86-video-fbdev \
xf86-video-vmware \
@@ -29,6 +29,11 @@ XSERVER = "xserver-xorg \
xserver-xorg-module-libint10 \
"
+XSERVER_RECOMMENDS = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
+ bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'mesa-driver-swrast', d), '', d)} \
+ "
+
MACHINE_FEATURES += "x86 pci"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
When building qemux86-64 machine run into nothing provides mesa-driver-swrast needed by packagegroup-core-x11-xserver-1.0-r0.qemux86_64 The XSERVER_RECOMMENDS variable will put mesa-driver-swrast into RRECOMMENDS of packagegroup-core-x11-xserver. This way error nolonger occurs. Signed-off-by: Vincent Davis Jr <vince@underview.tech> --- meta/conf/machine/include/qemu.inc | 6 +++++- meta/conf/machine/qemux86-64.conf | 7 ++++++- meta/conf/machine/qemux86.conf | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-)