summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2012-11-16 18:37:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-18 16:42:10 +0000
commit9acfef96333ffe6e08998e6fd69187c14532d26c (patch)
tree7848ae5d5b99e63eeca96d0ac6430cbb20fc8997 /scripts
parenta0123b0168dc805e200ec47a04ebc764f89ee83d (diff)
downloadpoky-9acfef96333ffe6e08998e6fd69187c14532d26c.tar.gz
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 <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf5
1 files changed, 1 insertions, 4 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 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 \
44 xf86-input-vmmouse \ 44 xf86-input-vmmouse \
45 xf86-input-keyboard \ 45 xf86-input-keyboard \
46 xf86-input-evdev \ 46 xf86-input-evdev \
47 xf86-video-vmware \ 47 xf86-video-vmware"
48 qemugl"
49require conf/machine/include/qemu.inc 48require conf/machine/include/qemu.inc
50GLIBC_ADDONS = "nptl"
51GLIBC_EXTRA_OECONF = "--with-tls"
52 49
53{{ if qemuarch == "arm": }} 50{{ if qemuarch == "arm": }}
54KERNEL_IMAGETYPE = "zImage" 51KERNEL_IMAGETYPE = "zImage"