From 40232ed397a586a520ce6ef6e005d4db336ace03 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 11 Sep 2013 12:07:21 +0100 Subject: [PATCH] yocto-bsp: conditionalise mesa-swrast on opengl in templates As per the similar commit in oe-core on the qemu machines, the templates should respect the opengl DISTRO_FEATURE when adding mesa-driver-swrast to new qemu machines. (From meta-yocto rev: 8d42ea2b2566913642c759e48ffe1f5f5166c510) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../substrate/target/arch/qemu/conf/machine/{{=machine}}.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf index d66d28f7ad..782ac217d9 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf @@ -47,7 +47,7 @@ MACHINE_FEATURES += "x86" 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 \