From: Ross Burton Date: Wed, 11 Sep 2013 11:07:21 +0000 (+0100) Subject: yocto-bsp: conditionalise mesa-swrast on opengl in templates X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d42ea2b2566913642c759e48ffe1f5f5166c510;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 d66d28f7ad0..782ac217d93 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 \