qemu: only depend on mesa-driver-swrast if opengl is enabled
PATCH 1/1 qemu: only depend on mesa-driver-swrast if opengl is enabled
As Mesa refuses to compile if the "opengl" DISTRO_FEATURE isn't enabled, mesa-driver-swrast has to be conditional in the QEMU machine defintions too.
Signed-off-by Ross Burton <[email protected]>
--- meta/conf/machine/include/qemu.inc | 2 +- meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/conf/machine/include/qemu.inc +1 -1
@@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" XSERVER ?= "xserver-xorg \ - mesa-driver-swrast \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ xf86-input-evdev \ xf86-input-mouse \ xf86-video-fbdev \
meta/conf/machine/qemux86-64.conf +1 -1
@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" XSERVER = "xserver-xorg \ - mesa-driver-swrast \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ xf86-input-vmmouse \ xf86-input-keyboard \ xf86-input-evdev \
meta/conf/machine/qemux86.conf +1 -1
@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" XSERVER = "xserver-xorg \ - mesa-driver-swrast \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ xf86-input-vmmouse \ xf86-input-keyboard \ xf86-input-evdev \
Signature · 1 line
1.7.10.4