From e7f3fee059472cfce383b6fb44bed8190037a3c0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 11 Sep 2013 10:27:22 +0100 Subject: [PATCH] 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. (From OE-Core rev: 9951e1da6a755f9a46d3a595aa4c2f975aee8f46) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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(-) diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 95d7e6650c..a78622d903 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -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 \ diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index ff666af1f7..c572225f8b 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -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 \ diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 5f107bea8b..94ee57392d 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -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 \