[poky] [PATCH] yocto-bsp: update qemu machine.conf template

[Stefan Stanacar]

Building a qemu sato image with a MACHINE created by yocto-bsp fails because nothing RPROVIDES qemugl anymore so remove qemugl support from the template as well (drop the entire XSERVER assign because it's included from qemu.inc)

Also drop redundant glibc configure knobs (nptl and tls are no longer optional and they don't exist in conf/machine/qemux86* anyway).

This is basically a sync with latest commits on meta/conf/machine/qemux86*

Signed-off-by: Stefan Stanacar <stefanx.stanacar at intel.com>
---
 .../substrate/target/arch/qemu/conf/machine/{{=machine}}.conf  | 10 ----------
 1 file changed, 10 deletions(-)

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 d1f50c1..958d6da 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
@@ -38,17 +38,7 @@ require conf/machine/include/tune-mips32.inc
 MACHINE_FEATURES += "x86"
 KERNEL_IMAGETYPE = "bzImage"
 SERIAL_CONSOLE = "115200 ttyS0"
-# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xorg \
-           mesa-dri-driver-swrast \
-           xf86-input-vmmouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-video-vmware \
-           qemugl"
 require conf/machine/include/qemu.inc
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
 
 {{ if qemuarch == "arm": }}
 KERNEL_IMAGETYPE = "zImage"
-- 
1.7.11.7