From 9acfef96333ffe6e08998e6fd69187c14532d26c Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Fri, 16 Nov 2012 18:37:27 +0200 Subject: yocto-bsp: update qemu machine.conf template Update the template with the changes from the last commits to meta/conf/machine/qemux86.conf Building sato image for a machine created using yocto-bsp with qemux86/x86-64 templates fails because nothing RPROVIDES qemugl anymore so remove support from the template as well. Also drop redundant glibc configure knobs (they are no longer optional and they don't exist in conf/machine/qemux86.conf anymore so for consistency the template shouldn't keep them). (From meta-yocto rev: 644c201a8fb9e589cdda1f76385a0b41549ea057) Signed-off-by: Stefan Stanacar Signed-off-by: Richard Purdie --- .../bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'scripts') 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 d1f50c1e7a..01e646d2fe 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 @@ -44,11 +44,8 @@ XSERVER ?= "xserver-xorg \ xf86-input-vmmouse \ xf86-input-keyboard \ xf86-input-evdev \ - xf86-video-vmware \ - qemugl" + xf86-video-vmware" require conf/machine/include/qemu.inc -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" {{ if qemuarch == "arm": }} KERNEL_IMAGETYPE = "zImage" -- cgit v1.2.3-54-g00ecf