summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-11 10:27:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-11 11:05:05 +0100
commite7f3fee059472cfce383b6fb44bed8190037a3c0 (patch)
treec096c3aaa4fadcd1228c22d2fabbe36e3bc5ef0f /meta/conf
parent4c3f8d206396d4f85792d5e92ab048217b3354b5 (diff)
downloadpoky-e7f3fee059472cfce383b6fb44bed8190037a3c0.tar.gz
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
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"
5PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 5PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
6 6
7XSERVER ?= "xserver-xorg \ 7XSERVER ?= "xserver-xorg \
8 mesa-driver-swrast \ 8 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
9 xf86-input-evdev \ 9 xf86-input-evdev \
10 xf86-input-mouse \ 10 xf86-input-mouse \
11 xf86-video-fbdev \ 11 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"
15SERIAL_CONSOLE = "115200 ttyS0" 15SERIAL_CONSOLE = "115200 ttyS0"
16 16
17XSERVER = "xserver-xorg \ 17XSERVER = "xserver-xorg \
18 mesa-driver-swrast \ 18 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
19 xf86-input-vmmouse \ 19 xf86-input-vmmouse \
20 xf86-input-keyboard \ 20 xf86-input-keyboard \
21 xf86-input-evdev \ 21 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"
15SERIAL_CONSOLE = "115200 ttyS0" 15SERIAL_CONSOLE = "115200 ttyS0"
16 16
17XSERVER = "xserver-xorg \ 17XSERVER = "xserver-xorg \
18 mesa-driver-swrast \ 18 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
19 xf86-input-vmmouse \ 19 xf86-input-vmmouse \
20 xf86-input-keyboard \ 20 xf86-input-keyboard \
21 xf86-input-evdev \ 21 xf86-input-evdev \